Merge branch 'sit-Carl' into sit-Leung

rc-busness/assets/css/global.less

@@ -8,10 +8,7 @@ body{
 .fade-leave-active {
   opacity: 0;
 }
-.ts-no-data{
+
-	text-align: center;
-	margin:3rem 0;
-}
 .ts-mask{
 	width:100%;
 	height:100%;
@@ -69,6 +66,8 @@ body{
 }
 //用户光点
 .rc-screen-reader{
+	width: 0.81rem;
+	height: 0.81rem;
 	border-radius: 50%;
     position: absolute;
     background-color: red;
@@ -78,13 +77,6 @@ body{
     width: 0.37rem;
     height: 0.37rem;
 }
-.rc-menu--xs .rc-screen-reader{
-	left: 30%;
-}
-.rc-list__link.ts-login--xs .rc-screen-reader{
-	left:16%;
-}
-
 img, picture {
     display: block;
     max-width: 100%;
@@ -111,8 +103,7 @@ img, picture {
 	li{
 		border: 1px solid #D7D7D7;
 		display: inline-flex;
-		border-bottom-left-radius: 4px;
+		border-radius: 4px;
-		border-bottom-right-radius: 4px;
 		flex-direction: column;
 		max-width:10rem;
 		.rc-column
@@ -144,7 +135,7 @@ img, picture {
 	}
 	img{
 		width:10rem;
-		min-height:10rem;
+		height:10rem;
 		object-fit: contain;
 		display: flex;
 		margin: 0 auto;
@@ -339,9 +330,6 @@ img, picture {
 	html {
 		//font-size:100px;
 	}
-	.rc-list__link.ts-login--xs .rc-screen-reader{
-		left:7%;
-	}
 	.rc-md-up {
 	    display: none!important;
 	}

rc-busness/assets/css/index.less

@@ -27,9 +27,6 @@
 		img{
 			border-radius: 50%;
 		}
-		&:first-child{
-			margin-left:0;
-		}
 		&.active {
 			img{
 				border: 3px solid #E2001A;
@@ -49,8 +46,8 @@
 .uservideo{
 	overflow: hidden;
 	video{
-		width:100%;
+		height:100%;
-		height:auto;
+		width:auto;
 	}
 }
 .ul-dog{
@@ -184,31 +181,38 @@
 	#xxxFullScreen {
 	background-color: white;
 	margin-top: 0.40rem;
+	#swiper1 {
+		overflow: hidden;
+	}
 	.swiper-container{
 	height: 6.45rem;
 	}
-		.swiper-container {
+	.swiper-container, .swiper-container2 {
 	width: 100%;
+	// overflow: visible !important;
 	height: 100%;
 	position: relative;
 	}
-		.swiper-container .swiper-wrapper .swiper-slide {
+	#swiper1 .swiper-container .swiper-wrapper .swiper-slide {
 		width: 17.25rem;
 		//height: 6.45rem !important; //Auto adaption
 	}
 
 	/* 上一张 */
-		swiper-container .swiper-wrapper .swiper-slide-prev {
+	#swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev {
 	margin-top: 0.05rem;
 	height: 100%;
+
 	}
 	/* 下一张 */
-		.swiper-container .swiper-wrapper .swiper-slide-next {
+	#swiper1 .swiper-container .swiper-wrapper .swiper-slide-next {
 	margin-top: 0.05rem;
 	height: 100%;
+
 	}
 	.swiper-container .swiper-wrapper .swiper-slide-active {
 	height: 100%;
+
 	}
 	.uservideo{
 		width: 100%;
@@ -234,7 +238,6 @@
 			flex-direction: column;
 			justify-content: flex-start;
 			align-items: center;
-			vertical-align: top;
 		}
 		img{
 			width: 10rem;
@@ -277,7 +280,7 @@
 
 	/* 中间的图片 */
 	.swiper-container .swiper-wrapper .swiper-slide-active {
-
+	height: 165px !important;
 	}
 	.swiperWrap{
 	height: 469px;
@@ -285,6 +288,8 @@
 	img{
 	height: 469px;
 	width: 100%;
+
+
 	}
 	/deep/.swiper-pagination-bullet-active{
 	background: red;
@@ -378,9 +383,6 @@
 	}
 	.ts-banner-swiper-container{
 		position:relative;
-		img{
-			margin:0 auto;
-		}
 		.ts-carousel-indicator{
 			position:absolute;
 			bottom:.4rem;

rc-busness/assets/css/login.less

@@ -55,13 +55,11 @@
   }
   .container {
     font-size: 0.1rem;
-	background-color:#fff;
     .van-field__body {
       border-bottom: 1px solid red;
     }
     .content {
       margin-top: 24px;
-	  box-shadow: unset;
     }
     .userfoget {
       font-size: 14px;

rc-busness/components/header.vue

@@ -6,7 +6,6 @@
 	      <li class="rc-list__item rc-xl-down">
 	      <button class="rc-btn rc-btn--icon-label rc-icon rc-menu--xs rc-iconography rc-md-up" data-modal-trigger="main-nav-modal" aria-label="Menu" role="menuitem">
 	      	菜单
-			<em class="rc-screen-reader" v-show="loginornot"></em>
 	      </button>
 	      <button class="rc-btn rc-btn--icon rc-icon rc-menu--xs rc-iconography rc-md-down" data-js-trigger="mobile-push-nav" aria-label="Menu" role="menuitem">
 			<span class="rc-screen-reader-text">
@@ -46,7 +45,10 @@
 				<span class="rc-screen-reader-text">
 					登录
 				</span>
-				<em class="rc-screen-reader" v-show="loginornot"></em>
+				 <em class="rc-screen-reader" v-show="loginornot">
+				    
+				 </em>
+				 
 			</a>
 			
 			<!--
@@ -303,12 +305,6 @@
 	
 	        <div class="rc-column rc-padding-x--none">
 	            <ul class="rc-list rc-list--blank rc-list--align rc-btn-offset--top" role="menu">
-				  <li class="rc-list__item">
-				    <a class="rc-list__link rc-icon ts-login--xs" role="menuitem" data-modal-trigger="main-nav-modal" @click="turnlogin">
-				    	个人中心
-						<em class="rc-screen-reader" v-show="loginornot"></em>
-				    </a>
-				  </li>
 	              <li class="rc-list__item">
 	                <a class="rc-list__link rc-icon rc-email--xs rc-iconography--xs" role="menuitem" href="https://royalcanin.com.cn/about/contact">
 	                	与我们联系

rc-busness/components/rc-footer.vue

@@ -203,7 +203,7 @@
       <div class="rc-column rc-text--center rc-padding-y--none">
         <span class="">法律声明 ©2021 ROYAL CANIN, Inc.</span>
         <br/>
-        <a target='_blank' href='https://royalcanin.com.cn/privacy'><span class="">隐私声明</span></a>
+        <a target='_blank' href='https://royalcanin.com.cn/#privacy'><span class="">隐私声明</span></a>
         &nbsp; | &nbsp;
 		<a target='_blank' href='https://royalcanin.com.cn/declaration'><span class="">法律声明</span></a>
       </div>

rc-busness/nuxt.config.js

@@ -4,16 +4,16 @@ export default {
   
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
-    title: '皇家官方商城',
+    title: 'rc-busness',
     
     htmlAttrs: {
-      lang: 'zh-cn',
+      lang: 'en',
     },
     script: [
       //{ src: '/js/rem.js' },
       // { src: '/js/flexible.js', type: 'text/javascript', charset: 'utf-8'},
-      { src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' },//SOL
+      { src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' },
-      { src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' },//订单
+      //{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' },
 	  { innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8'},
 	  { innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8'},
 	  { src: '/royalcanin-cdn-assets-new/css_js/royal-canin.min.bundle.js' },

rc-busness/pages/index.vue

@@ -5,43 +5,9 @@
 	<!-- Suppose in header end -->
 	<div class="ts-banner-swiper-container">
 		<swiper :options="headerSwiperOption">
-			<swiper-slide>
+			<swiper-slide v-for="(banner, index) in showingBanners" :key="index">
-				<a href="#" target="_blank">
+				<a :href="banner.link" target="_blank">
-					<picture>
+					<img :src="banner.src" class="useraimg"/>
-						<source media="(max-width: 768px)" srcset="/images/banner/one.jpg">
-						<source media="(min-width: 769px)" srcset="/images/banner/pc-banner1.png">
-						<img src="/images/banner/one.jpg">
-					</picture>
-				</a>
-			</swiper-slide>
-			
-			<swiper-slide>
-				<a href="#" target="_blank">
-					<picture>
-						<source media="(max-width: 768px)" srcset="/images/banner/two.jpg">
-						<source media="(min-width: 769px)" srcset="/images/banner/pc-banner2.png">
-						<img src="/images/banner/two.jpg">
-					</picture>
-				</a>
-			</swiper-slide>
-			
-			<swiper-slide>
-				<a href="#" target="_blank">
-					<picture>
-						<source media="(max-width: 768px)" srcset="/images/banner/three.jpg">
-						<source media="(min-width: 769px)" srcset="/images/banner/pc-banner3.png">
-						<img src="/images/banner/three.jpg">
-					</picture>
-				</a>
-			</swiper-slide>
-			
-			<swiper-slide>
-				<a href="#" target="_blank">
-					<picture>
-						<source media="(max-width: 768px)" srcset="/images/banner/four.jpg">
-						<source media="(min-width: 769px)" srcset="/images/banner/pc-banner4.png">
-						<img src="/images/banner/four.jpg">
-					</picture>
 				</a>
 			</swiper-slide>
 		</swiper>
@@ -83,7 +49,7 @@
 					<swiper-slide v-for="(item, index) in catlistvideo" :key="index">
 						<div class="rc-video">
 							<div class="uservideo">
-								<video controls="" :poster=item.catimage preload="none">
+								<video controls="" :poster=item.catimage>
 									<source :src=item.video type="video/mp4">
 								</video>
 							</div>
@@ -99,7 +65,7 @@
 						<div class="sw-center" >
 							<div class="rc-click"  @click="selectproduce(item,index)">
 								<div class="uservideo">
-									<video controls="controls" :poster=item.catimage preload="none">
+									<video controls="controls" :poster=item.catimage>
 										<source :src= item.video type="video/ogg">
 									</video>
 								</div>
@@ -129,7 +95,6 @@
 	<van-tabs @click='catclickShi' class="van-tabs" v-if="onemao" v-model="maoshiCurIndex">
 	  <van-tab v-for="(item,index) in discoun" :key="index" :title="item.title">
 	       <div class="rc-contair">
-			 <div class="ts-no-data" v-if="!catshi.length">暂未发现相关记录</div>
 	         <ul class="ts-product-list rc-margin-bottom--lg">
 	             <li v-for="(item,index) in catshi" :key="index" class="rc-margin-top--md">
 					 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -184,7 +149,6 @@
 	  </ul>
 	  </div>
 	         <div class="">
-				 <div class="ts-no-data" v-if="!catshi.length">暂未发现相关记录</div>
 				<ul class="ts-product-list rc-margin-bottom--lg">
 				    <li v-for="(item,index) in rccontair" :key="index" class="rc-margin-top--md">
 								 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -215,7 +179,6 @@
 	<van-tabs @click='catclickGan' class="van-tabs" v-if="twomao" v-model="maoganCurIndex">
 	  <van-tab v-for="(item,index) in discoun" :key="index" :title="item.title">
 	       <div class="rc-contair">
-			   <div class="ts-no-data" v-if="!catgan.length">暂未发现相关记录</div>
 				<ul class="ts-product-list rc-margin-bottom--lg">
 				    <li v-for="(item,index) in catgan" :key="index" class="rc-margin-top--md">
 						 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -273,7 +236,6 @@
 	  </ul>
 	  </div>
 	         <div class="rc-contair">
-				 <div class="ts-no-data" v-if="!rccontair.length">暂未发现相关记录</div>
 				 <ul class="ts-product-list rc-margin-bottom--lg">
 				     <li v-for="(item,index) in rccontair" :key="index" class="rc-margin-top--md">
 				 		 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -317,7 +279,7 @@
 				 	<swiper-slide v-for="(item, key) in doglistvideo" :key="key">
 	                  <div class="rc-video">
 	                    <div class="uservideo">
-							<video controls="" :poster=item.catimage preload="none">
+							<video controls="" :poster=item.catimage>
 								<source :src=item.video type="video/mp4">
 							</video>
 	                    </div>
@@ -333,7 +295,7 @@
 	                         <div class="sw-center" >
 								<div class="rc-click"  @click="selectproduce(item,index)">
 									<div class="uservideo">
-										<video controls="controls" preload="none" :poster="item.catimage">
+										<video controls="controls">
 											<source :src= item.video type="video/ogg">
 										</video>
 									</div>
@@ -381,8 +343,6 @@
 		</div>
 	
 	       <div class="rc-contair">
-				<div class="ts-no-data" v-if="!dogshi.length">暂未发现相关记录</div>
-				
 				<ul class="ts-product-list rc-margin-bottom--lg">
 				    <li v-for="(item,index) in dogshi" :key="index" class="rc-margin-top--md">
 						 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -428,6 +388,8 @@
 	  </ol>
 	     <div class="rc-maa">
 	  <ul>
+	 
+	     
 	    <li 
 	      v-for="(item, index) in doglist"
 	            :key="index"
@@ -495,7 +457,6 @@
 				</ul>
 		</div>
 	       <div class="rc-contair">
-			   <div class="ts-no-data" v-if="!doggan.length">暂未发现相关记录</div>
 				<ul class="ts-product-list rc-margin-bottom--lg">
 				    <li v-for="(item,index) in doggan" :key="index" class="rc-margin-top--md">
 						 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -592,7 +553,6 @@
 	<van-tabs @click='userclick' class="van-tabs" v-if="fivemao">
 	  <van-tab v-for="(item,index) in discounchufang" :key="index" :title="item.title">
 	       <div class="rc-contair">
-			   <div class="ts-no-data" v-if="!processinformation.length">暂未发现相关记录</div>
 				<ul class="ts-product-list rc-margin-bottom--lg">
 				    <li v-for="(item,index) in processinformation" :key="index" class="rc-margin-top--md rc-padding-bottom--lg">
 						 <div class="rc-click rc-margin-bottom--md" @click="selectproduce(item,index)">
@@ -780,16 +740,19 @@
         doggan:[],
         dogtype:[
 			{
-				title: "离乳期",
+				title: "幼犬",
 			},
 			{
-				title: "幼年",
+				title: "成犬",
 			},
 			{
-				title: "成年",
+				title: "老年犬",
 			},
 			{
-				title: "老年",
+				title: "品种犬",
+			},
+			{
+				title: "亚健康",
 			}
 		],
 		anchor:'',
@@ -860,17 +823,22 @@
 		],
 		discoun: [
 			{
-				title: "<4月龄",
+			  title: "幼猫",
 			},
 			{
-				title: "4-12月龄",
+			  title: "成猫",
 			},
 			{
-				title: "1-7岁",
+			  title: "老年猫",
 			},
 			 {
-				title: ">7岁"
+			  title: "品种猫",
-			}
+			   
+			  
+			},
+			{
+			  title: "亚健康猫"
+			},
 		],
 
         discountlist: [
@@ -1097,12 +1065,9 @@
 			centeredSlides: true,
 			speed:1000,
 			spaceBetween: 0,
-			autoplay: {
+			autoplay: true,
-				 delay: 3000,
-			},
 			pagination: {
-				el: '#homeBannerSwiperPagnation',
+				el: '#homeBannerSwiperPagnation'
-				clickable: true
 			},
 			paginationClickable: true,
 			loopAdditionalSlides: 100,
@@ -1129,7 +1094,6 @@
 			loopAdditionalSlides: 100,
 			pagination: {
 				el: '#catStarSwiperPagnation',
-				clickable: true
 			},
 			navigation: {
 				nextEl: '.swiper-button-next',
@@ -1153,7 +1117,6 @@
 			loopAdditionalSlides: 100,
 			pagination: {
 				el: '#dogStarSwiperPagnation',
-				clickable: true
 			},
 			navigation: {
 				nextEl: '.swiper-button-next',
@@ -1404,14 +1367,13 @@
 		userdogShi(){
 			this.activeIndex5=(this.activeIndex5?this.activeIndex5:0);
 			let apiDogSize=this.userdoglist[this.activeIndex5].title;
-			let apiDogAgeType=this.dogtype[this.quanshiCurIndex].title;
+			let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title;
 			
 			this.userstype=1;
 			let petType={
 				petType:1,
 				categoryName:"皇家犬湿粮",
-				tagUsedAge:apiDogAgeType,
+				name:apiDogFoodType,
-				name:apiDogSize
 			}
 			for(let i =0;i<this.userserachlist.length;i++){
 				if(!this.userserachlist.includes(petType)){
@@ -1424,13 +1386,12 @@
 		userdogGan(){
 			this.activeIndex6=(this.activeIndex6?this.activeIndex6:0);
 			let apiDogSize=this.userdoglist[this.activeIndex6].title;
-			let apiDogAgeType=this.dogtype[this.quanganCurIndex].title;
+			let apiDogFoodType=this.dogtype[this.quanganCurIndex].title;
 			
 			this.userstype=1;
 			let petType={
 				petType:1,
-				tagUsedAge:apiDogAgeType,
+				name:apiDogFoodType,
-				name:apiDogSize
 			}
 			for(let i =0;i<this.userserachlist.length;i++){
 				if(!this.userserachlist.includes(petType)){
@@ -1541,7 +1502,6 @@
 				//userlist=data.slice(0,6);
 				if(dataType)
 				{
-					console.log(this.dogshi,this.dogshi.length);
 					if(dataType=='Shi')
 						this.dogshi=data;
 					else if(dataType=='Gan')
@@ -1602,10 +1562,10 @@
 		catclickGan(){
 			this.userstype=0;
 			this.maoganCurIndex=this.maoganCurIndex?this.maoganCurIndex:0;
-			let apiCatAgeType=this.discoun[this.maoganCurIndex].title;
+			let apiCatType=this.discoun[this.maoganCurIndex].title;
 			let petType={
 				petType:0,
-				tagUsedAge:apiCatAgeType
+				name:apiCatType,
 			}
 			for(let i =0;i<this.userserachlist.length;i++){
 				if(!this.userserachlist.includes(petType)){
@@ -1617,11 +1577,11 @@
 		catclickShi(){
 			this.userstype=0;
 			this.maoshiCurIndex=this.maoshiCurIndex?this.maoshiCurIndex:0;
-			let apiCatAgeType=this.discoun[this.maoshiCurIndex].title;
+			let apiCatType=this.discoun[this.maoshiCurIndex].title;
 			let petType={
 				petType:0,
 				categoryName:"皇家猫湿粮",
-				tagUsedAge:apiCatAgeType
+				name:apiCatType,
 			}
 			for(let i =0;i<this.userserachlist.length;i++){
 				if(!this.userserachlist.includes(petType)){

rc-busness/pages/personal/discount.vue

@@ -75,7 +75,79 @@ export default {
       userstates:0,
       userimage: require("../../assets/image/unused.png"),
       newlist: [
-        
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+          catimage: require("../../assets/image/unused.png"),
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+          catimage: require("../../assets/image/unused.png"),
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+          catimage: require("../../assets/image/unused.png"),
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
       ],
       discountlist: [
         {
@@ -90,7 +162,27 @@ export default {
       ],
 
       preferential: [
-        
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
+        {
+          price: "30",
+          pricestype: "新客优惠券",
+          special: "全场每满299-30",
+          period: "有效期",
+          starttime: "2021.11.29-2022.01.28",
+        },
       ],
       userdiscount:[],
       activeIndex: 0,
@@ -189,5 +281,6 @@ import Myheader from "~/components/header.vue";
 
 <style lang="less" scoped>
 // 手机端
+@import url("../../assets/css/global.less");
 @import url("../../assets/css/discount.less");
 </style>

rc-busness/pages/personal/integral.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
     <Myheader></Myheader>
-	<div class="rc-top"></div>
+
          <div class="rc-usermain ">
           <ul>
               <li v-for="(item,index) in userrecord" :key="index">

rc-busness/pages/useraddress/addaddress.vue

@@ -1,5 +1,4 @@
 <template>
-	<div>
   <van-address-edit
   :area-list="areaList"
   show-postal
@@ -11,16 +10,13 @@
   @save="onSave"
   @delete="onDelete"
   @change-detail="onChangeDetail"
-	/>
+/>
-	<addressInput></addressInput>
-</div>
 </template>
 
 <script>
 import { editaddress } from "../../ajax/getData";
 import { Toast } from 'vant';
 import { areaList } from '@vant/area-data';
-import addressInput from '~/components/addressInput.vue' //引用头部公共组件
 export default {
   data(){
       return{
@@ -73,7 +69,7 @@ export default {
 
   },
   components:{
-	addressInput
+  
   },
   
 

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="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
+          <a href="#" class="rc-styled-link"><span>隐私政策</span></a>
         </div>
         <div class="rc-column rc-text--right">
           <nuxt-link :to="`/userlogin/login/`" class="rc-styled-link">
@@ -84,7 +84,6 @@
               @click="register()"
               class="ts-standard-btn ts-standard-btn--max-width"
               value="注册"
-			  readonly=""
           ></input
           >
           <!-- <van-divider @click="toLogin">注册账户</van-divider> -->

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="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
+          <a href="#" class="rc-styled-link"><span>隐私政策</span></a>
         </div>
         <div class="rc-column rc-text--right">
           <nuxt-link :to="`/userlogin/edit/`" class="rc-styled-link">
@@ -104,7 +104,6 @@
               @click="register()"
               class="ts-standard-btn ts-standard-btn--max-width"
               value="登录"
-			  readonly=""
           ></input
           >
           <!-- <van-divider @click="toLogin">注册账户</van-divider> -->

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java

@@ -1,6 +1,7 @@
 package net.lab1024.smartadmin.module.system.royalcanin.good;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.internal.util.AlipaySignature;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity;
 import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig;
 import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress;
+import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
@@ -101,7 +103,7 @@ public class OrderController {
             wxPayEntity.setProduct_id(ordersEntity.getProductCode());
             wxPayEntity.setTotal_fee(StringUtil.toString(total_fee));
             wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
-            return ResponseDTO.succData(wxpayService.generateQRCode(wxPayEntity));
+            return ResponseDTO.succData(ordersEntity.getOrderNo(),wxpayService.generateQRCode(wxPayEntity));
         }
         return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL);
     }
@@ -168,6 +170,31 @@ public class OrderController {
         }
     }
 
+    @ApiOperation(value = "重新支付", notes = "重新支付")
+    @PostMapping("royalcanin/repayOrderWX")
+    public ResponseDTO<String> repayOrderWX(String orderNo) throws Exception {
+        OrderEntity ordersEntity = orderService.findByOrderId(orderNo);
+        if(ordersEntity != null){
+            QueryEntity queryEntity = new QueryEntity();
+            queryEntity.setOrderNumber(ordersEntity.getOrderNo());
+            String orderInfo  = orderService.query(queryEntity);
+            com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderInfo);
+            JSONObject jsonObject = (JSONObject)jsonArray.get(0);
+            if(jsonObject.getString("status").equals("0")) {
+                WxPayEntity wxPayEntity = new WxPayEntity();
+                wxPayEntity.setProduct_id(ordersEntity.getProductCode());
+                wxPayEntity.setTotal_fee(jsonObject.getString("salesAmount"));
+                wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
+                return ResponseDTO.succData(orderInfo, wxpayService.generateQRCode(wxPayEntity));
+            }else {
+                return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,orderInfo);
+            }
+        }else {
+            return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER);
+        }
+    }
+
+
 
 
     @ApiOperation(value = "更新订单", notes = "更新订单")

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java

@@ -20,6 +20,8 @@ public class OrderResponseCodeConst extends ResponseCodeConst {
 
     public static final OrderResponseCodeConst WITHOUT_ORDER = new OrderResponseCodeConst(9007, "没有该订单数据！");
 
+    public static final OrderResponseCodeConst GENERATE_ORDER_ERROR = new OrderResponseCodeConst(9008, "该订单数据有误，请联系管理员！");
+
     public OrderResponseCodeConst(int code, String msg) {
         super(code, msg);
     }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java

@@ -162,7 +162,24 @@ public class OrderService {
             addOrSaveEntity.setDeliveryType(jsonObject.getString("deliveryType"));
             addOrSaveEntity.setSalesAmount(jsonObject.getString("salesAmount"));
             addOrSaveEntity.setOrderDate(jsonObject.getString("orderDate"));
+            addOrSaveEntity.setAddressCityName(jsonObject.getString("addressCityName"));
+            addOrSaveEntity.setAddressCountyName(jsonObject.getString("addressCountyName"));
+            addOrSaveEntity.setAddressDetailInfo(jsonObject.getString("addressDetailInfo"));
+            addOrSaveEntity.setAddressPhoneNumber(jsonObject.getString("addressPhoneNumber"));
+            addOrSaveEntity.setAddressProvinceName(jsonObject.getString("addressProvinceName"));
+            addOrSaveEntity.setAddressUserName(jsonObject.getString("addressUserName"));
             addOrSaveEntity.setPaymentAmount(totalFee);
+            if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) {
+                //coupon json化
+                OrderCouponEntity orderCouponEntity = new OrderCouponEntity();
+                orderCouponEntity.setCouponCode(ordersEntity.getCouponCode());
+                orderCouponEntity.setCouponName(ordersEntity.getCouponName());
+                orderCouponEntity.setCouponId(ordersEntity.getCouponId());
+                Map<String, String> orderCouponParamMap  = MapRemoveNullUtil.setConditionMap(orderCouponEntity);
+                MapRemoveNullUtil.removeNullEntry(orderCouponParamMap);
+                net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap);
+                addOrSaveEntity.setOrderCoupon(orderCouponJson.toString());
+            }
             addOrSave(addOrSaveEntity);
             return ResponseDTO.succ();
         }else{
@@ -247,4 +264,9 @@ public class OrderService {
         }
         return endTotal;
     }
+
+    public OrderEntity findByOrderId(String orderNo){
+        return ordersDao.findByOrderId(orderNo);
+    }
+
 }