diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js
index f1324f3a..8207ca71 100644
--- a/rc-busness/ajax/getData.js
+++ b/rc-busness/ajax/getData.js
@@ -208,17 +208,22 @@ export const userquery = (stype, ) => {
   return fetch('goods?petType='+stype, data, 'POST' )
 }
 //处方信息
-export const userque = (goodsName, curPage,curRow) => {
+export const userque = (goodsName, petType, curPage,curRow) => {
 	if(!curPage)
 		curPage=1;
 	if(!curRow)
 		curRow=10;
-  let queryTail='page='+curPage+'&rows='+curRow;
+  let queryTail='&page='+curPage+'&rows='+curRow;
+  let query='?0';
   if(goodsName)
-	queryTail = '?goodsName='+goodsName;
+	query += '&goodsName='+goodsName;
+  if(petType!==undefined && petType!=='') {
+	  query += '&petType='+petType;
+  }
+  query += queryTail;
   var data = {
   }
-  return fetch('goods'+queryTail, data, 'POST' )
+  return fetch('goods'+query, data, 'POST' )
 }
 
 
diff --git a/rc-busness/ajax/util.js b/rc-busness/ajax/util.js
index 9be51c9c..469b9115 100644
--- a/rc-busness/ajax/util.js
+++ b/rc-busness/ajax/util.js
@@ -35,20 +35,45 @@ let util = {
 		}
 	},
 	checkPaytypeValidated($paytype) {
-		if(isWx && $paytype == 1) {
-			//return 3;
-			return true;
-		} else if(isWx && $paytype!=1) {
-			return false;
+		let isMobile = this.isMobile();
+		let isWx = this.isWX();
+		//Dictionary : 1:WX native pay, 2:Alipay, 3:WX H5 pay
+		if((isWx || !isMobile) && $paytype == 1) {
+			return {'result':true};
 		}
-		
-		if(!isMobile && $paytype == 1) {
-			//Desktop, use native pay
-			return true;
-		} else if(isMobile && $paytype == 2) {
-			return true;
+		if(isMobile && !isWx && $paytype == 3) {
+			return {'result':true};
 		}
-		return false;
+		if($paytype == 2) {
+			return {'result':true};
+		}
+		let message='';
+		switch($paytype) {
+			case "1":
+				message = '请返回电脑网页端继续当前订单的支付';
+				break;
+			case "2":
+				message = '请返回支付宝继续当前订单的支付';
+				break;
+			case "3":
+				message = '请返回手机网页端继续当前订单的支付';
+				break;
+			default:
+				message = '订单已过期，请重新下单';
+				break;
+		}
+		return {'result':false,'message':message};
+	},
+	getTextByPaytype(paytype){
+		//Dictionary : 1:WX native pay, 2:Alipay, 3:WX H5 pay
+		let mapping = {
+			"1":"微信扫码支付",
+			"2":"支付宝支付",
+			"3":"手机网页支付",
+		};
+		if(mapping.hasOwnProperty(paytype))
+			return mapping[paytype];
+		return '';
 	}
 }
 export default util;
\ No newline at end of file
diff --git a/rc-busness/app.html b/rc-busness/app.html
index afb50e74..9d062a45 100644
--- a/rc-busness/app.html
+++ b/rc-busness/app.html
@@ -13,6 +13,23 @@
 	  var s = document.getElementsByTagName("script")[0]; 
 	  s.parentNode.insertBefore(hm, s);
 	})();
+	function bindTracking(ele,timeout)
+	{
+		var eventName=ele.getAttribute('evt-name');
+	    var eventCat=ele.getAttribute('evt-cat');
+	    var eventVal=ele.getAttribute('evt-val');
+	    var eventParams={};
+	    eventParams[eventCat]=eventVal;
+	    _hmt.push(['_trackEvent', eventName, eventCat,  eventVal]); //Baidu Analytics Event Push
+	    if(timeout)
+	    {
+	    	setTimeout(function(){
+	    		window.location.href=ele.href;
+	    	},timeout);
+			return false;
+	    }
+	    return true;
+	}
 	</script>
   </body>
 </html>
\ No newline at end of file
diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index 4c11f919..4ddce0ae 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -10,6 +10,20 @@ body {
 	border:unset;
 }
 
+.ts-warning-popup {
+	.title{
+		img {
+			width:5rem;
+			height:auto;
+			margin-left:auto;
+			margin-right:auto;
+		}
+	}
+	.content span {
+		line-height:2rem;
+		font-size:1.2
+	}
+}
 
 .rc-menu--xs .rc-screen-reader{
 	left:28%;
@@ -191,7 +205,13 @@ picture {
 				white-space: normal;
 				color: #E2001A;
 			}
-
+			.desc {
+				height:3.8rem;
+				white-space: break-spaces;
+				word-break: keep-all;
+				margin:1rem auto;
+				line-height:1.9rem;
+			}
 			i {
 				font-style: normal;
 				font-size: 1.125rem;
diff --git a/rc-busness/assets/css/producted.less b/rc-busness/assets/css/producted.less
index 87e388dd..07a91ebd 100644
--- a/rc-busness/assets/css/producted.less
+++ b/rc-busness/assets/css/producted.less
@@ -122,6 +122,16 @@
 	  max-width:100%;
 	}
 }
+.tns-item {
+	video {
+		max-width:31.25rem;
+		min-width:28.25rem;
+		max-height:31.25rem;
+		min-height:28.25rem;
+		width:36vw;
+		height:36vw;
+	}
+}
 // 手机端
 @media screen and (max-width:768px) {
   .uservideo{
diff --git a/rc-busness/components/fixed-right.vue b/rc-busness/components/fixed-right.vue
index 6fbcad19..b10e7bc1 100644
--- a/rc-busness/components/fixed-right.vue
+++ b/rc-busness/components/fixed-right.vue
@@ -1,15 +1,28 @@
 <template>
-  	<div class="rc-fixright" >
-  		<ul >
-  			<li v-for="(userfixed,index) in fixedlist" :key="index" @click="lianxi(userfixed,index)">
-  				<img :src="userfixed.catimage" alt="">
-  				<span> {{userfixed.title}}</span>
-  			</li>
-  		</ul>
-  		<div class="tuntop" @click="toTop" v-show="gotop">
-  			<img src="../assets/image/turntop.png" alt="">
-  			<span>回到顶部</span>
-  		</div>
+  	<div class="rc-fixright-container">
+		<div class="rc-fixright">
+			<ul>
+				<li v-for="(userfixed,index) in fixedlist" :key="index" @click="lianxi(userfixed,index)">
+					<img :src="userfixed.catimage" alt="">
+					<span> {{userfixed.title}}</span>
+				</li>
+			</ul>
+			<div class="tuntop" @click="toTop" v-show="gotop">
+				<img src="../assets/image/turntop.png" alt="">
+				<span>回到顶部</span>
+			</div>
+		</div>
+		<el-dialog :visible.sync="customerServerStop" :close-on-click-modal="false">
+		  <div class="ts-warning-popup">
+		    <div class="title rc-full-width">
+		      <img src="../assets/error.png" alt="" />
+		    </div>
+		    <div class="content rc-full-width rc-text--center rc-margin-y--md">
+		      <h3>温馨提示</h3>
+		      <span class="">客服因法定春节假期暂停服务，<br/>预计2月10日恢复正常服务</span>
+		    </div>
+		  </div>
+		</el-dialog>
   	</div>
 </template>
 
@@ -18,6 +31,7 @@ import { mapMutations } from "vuex";
 export default {
 	data(){
 		return{
+			customerServerStop:false,
 			gotop: false,
 			loginornot:false,
 			fixedlist: [
@@ -43,10 +57,21 @@ export default {
 		...mapMutations(["checkIsLogin"]),
 		lianxi(item,index){
 			if(item.title=='在线客服'){
+				this.customerServerStop = true;
+				/* Stop until 2022-2-10
 				var option = {
 					customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
 				}
 				dis_livchat(option);
+				_hmt.push([
+				    "_trackCustomEvent",
+				    "cs_consult",
+				    {
+						"page_name_":this.$route.path,
+				        "shop_right_btn": 1,
+				    }
+				])
+				*/
 			}
 			if(item.title=='购物车'){
 				if(this.loginornot){
@@ -60,10 +85,22 @@ export default {
 				}
 			}
 			if(item.title=='营养专家'){
+				this.customerServerStop = true;
+				/* Stop until 2022-2-10
 				var option = {
 					customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
 				}
 				dis_livchat(option);
+				console.log(this.$route.path);
+				_hmt.push([
+				    "_trackCustomEvent",
+				    "sol_consult",
+				    {
+						"page_name_":this.$route.path,
+				        "shop_right_btn": 1,
+				    }
+				])
+				*/
 			}
 		},
 		toTop() {
diff --git a/rc-busness/components/rc-footer.vue b/rc-busness/components/rc-footer.vue
index 1f94e5e1..e827759a 100644
--- a/rc-busness/components/rc-footer.vue
+++ b/rc-busness/components/rc-footer.vue
@@ -211,6 +211,13 @@
 
     <div class="footer-block9 rc-layout-container rc-one-column rc-text-colour--brand3">
       <div class="rc-column rc-text--center rc-padding-top--none">
+        <a target='_blank' href='https://beian.miit.gov.cn' style="display: inline-block;">
+        	<img src='https://royalcanin.com.cn/profiles/custom/royal_canin_profile/themes/royal_canin/images/bei-symblo.png' style="float:left">
+        	<p style="float:left;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:#939393;">
+        		沪公网安备 31012002005532号
+        	</p>
+        </a>
+        <br/>
         <a target='_blank' href='https://beian.miit.gov.cn'><span class="">沪ICP备08000779号-2</span></a>
       </div>
     </div>
diff --git a/rc-busness/config/async/env.js b/rc-busness/config/async/env.js
index 9242ccff..8ff9739b 100644
--- a/rc-busness/config/async/env.js
+++ b/rc-busness/config/async/env.js
@@ -9,7 +9,7 @@ let baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'
 if (process.env.NODE_ENV === 'development') {
   baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/';
 } else if (process.env.NODE_ENV === 'production') {
-  baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/';
+  baseUrl = 'https://shop.royalcanin.com.cn/royalcanin/royalcanin/royalcanin/';
 }
 export {
   baseUrl,
diff --git a/rc-busness/config/async/fetch.js b/rc-busness/config/async/fetch.js
index 3a3bf8ef..71538891 100644
--- a/rc-busness/config/async/fetch.js
+++ b/rc-busness/config/async/fetch.js
@@ -36,7 +36,7 @@ export default async(url = '', data = {}, type = 'GET', method = 'fetch') => {
         'Content-Type': 'application/json',
 		'x-access-token': token
       },
-      mode: 'cors',
+      // mode: 'cors',
       // channelId:'H5@2021',
       cache: 'force-cache'
     }
diff --git a/rc-busness/config/env-data.js b/rc-busness/config/env-data.js
new file mode 100644
index 00000000..0643ef69
--- /dev/null
+++ b/rc-busness/config/env-data.js
@@ -0,0 +1,285 @@
+let devData={
+			newGuestCoupon:['0000000123','0000000140','0000000122'],
+			rxGoodsFilter:[{tagName:'体重管理',tagValue:'体重'},{tagName:'提升活力',tagValue:'活力'},{tagName:'泌尿道',tagValue:'泌尿'},{tagName:'消化道',tagValue:'消化'},{tagName:'皮肤',tagValue:'皮肤'}],
+			catlistvideo:[
+				{
+				  title: "主食级猫湿粮",
+				  video: "/images/cat/one.mp4",
+				  catimage: "/images/cat/one.jpg",
+				  productimage: "/images/cat/star-1.png",
+				  detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食",
+				  price: "¥372",
+				  productList: [
+				    {
+				      productCode: "80240008F24",
+				    },
+				  ],
+				},
+				{
+				  title: "幼猫成长专属",
+				  video: "/images/cat/two.mp4",
+				  catimage: "/images/cat/two.jpg",
+				  productimage: "/images/cat/star-2.png",
+				  detail: "支持幼猫自身保护力 为快速生长提供足够能量",
+				  price: "¥33",
+				  productList: [
+				    {
+				      productCode: "20030040",
+				    },
+				  ],
+				},
+				{
+				  title: "室内成猫专属",
+				  video: "/images/cat/three.mp4",
+				  catimage: "/images/cat/three.jpg",
+				  productimage: "/images/cat/star-3.png",
+				  detail: "高易消化蛋白 减少粪便量和异味",
+				  price: "¥157",
+				  productList: [
+				    {
+				      productCode: "21100200",
+				    },
+				  ],
+				},
+				{
+				  title: "英短成猫专属",
+				  video: "/images/cat/four.mp4",
+				  catimage: "/images/cat/four.jpg",
+				  productimage: "/images/cat/star-4.png",
+				  detail: "增强肌肉质量 支持骨骼与关节健康",
+				  price: "¥402",
+				  productList: [
+				    {
+				      productCode: "23040450",
+				    },
+				  ],
+				}
+			],
+			doglistvideo: [
+			  {
+			    title: "主食级狗湿粮",
+			    video: "/images/dog/one.mp4",
+			    catimage: "/images/dog/one.jpg",
+			    productimage: "/images/dog/star-1.png",
+			    detail: "柔软细腻慕斯 适合离乳期幼犬舔食",
+			    price: "¥359",
+			    productList: [
+			      {
+			        productCode: "81220020F12",
+			      },
+			    ],
+			  },
+			  {
+			    title: "贵宾成犬专属",
+			    video: "/images/dog/two.mp4",
+			    catimage: "/images/dog/two.jpg",
+			    productimage: "/images/dog/star-2.png",
+			    detail: "护肤靓毛 理想体态",
+			    price: "¥562",
+			    productList: [
+			      {
+			        productCode: "14200300",
+			      },
+			    ],
+			  },
+			  {
+			    title: "小型犬成犬专属",
+			    video: "/images/dog/three.mp4",
+			    catimage: "/images/dog/three.jpg",
+			    productimage: "/images/dog/star-3.png",
+			    detail: "亮泽被毛 呵护牙齿",
+			    price: "¥57",
+			    productList: [
+			      {
+			        productCode: "16020080",
+			      },
+			    ],
+			  },
+			  {
+			    title: "离乳期全价奶糕",
+			    video: "/images/dog/four.mp4",
+			    catimage: "/images/dog/four.jpg",
+			    productimage: "/images/dog/star-4.png",
+			    detail: "高易再水合颗粒 帮助增强保护健康成长",
+			    price: "¥263",
+			    productList: [
+			      {
+			        productCode: "17220400",
+			      },
+			    ],
+			  },
+			],
+			amature:[
+				{
+				  title: "中型幼犬离乳期全价奶糕",
+				  productimage: "/images/dogfoot.png",
+				  detail: "中心犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长",
+				  productCode:'17220400',
+				  price: "¥263",
+				  productList: [
+				    {
+				      productCode: "17220400,17221000,1722040002,17220400F03",
+				    },
+				  ],
+				},
+				{
+				  title: "皇家离乳期幼猫全价奶糕",
+				  productimage: "/images/catfoot.png",
+				  detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量",
+				  price: "¥189",
+				  productCode:'20010200',
+				  productList: [
+				    {
+				      productCode: "20010200,20011000,20010040",
+				    },
+				  ],
+				},
+			]
+		};
+
+//Production data
+let prdData={
+		newGuestCoupon:['0000000123','0000000140','0000000122','HJXRL20210827'],
+		rxGoodsFilter:[{tagName:'体重管理',tagValue:'体重'},{tagName:'提升活力',tagValue:'活力'},{tagName:'泌尿道',tagValue:'泌尿'},{tagName:'消化道',tagValue:'消化'},{tagName:'皮肤',tagValue:'皮肤'}],
+		catlistvideo:[
+			{
+			  title: "主食级猫湿粮",
+			  video: "/images/cat/one.mp4",
+			  catimage: "/images/cat/one.jpg",
+			  productimage: "/images/cat/star-1.png",
+			  detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食",
+			  price: "¥77",
+			  productList: [
+				{
+				  productCode: "80240008F24",
+				},
+			  ],
+			},
+			{
+			  title: "幼猫成长专属",
+			  video: "/images/cat/two.mp4",
+			  catimage: "/images/cat/two.jpg",
+			  productimage: "/images/cat/star-2.png",
+			  detail: "支持幼猫自身保护力 为快速生长提供足够能量",
+			  price: "¥146",
+			  productList: [
+				{
+				  productCode: "20030200,2003004003",
+				},
+			  ],
+			},
+			{
+			  title: "室内成猫专属",
+			  video: "/images/cat/three.mp4",
+			  catimage: "/images/cat/three.jpg",
+			  productimage: "/images/cat/star-3.png",
+			  detail: "高易消化蛋白 减少粪便量和异味",
+			  price: "¥140",
+			  productList: [
+				{
+				  productCode: "21100200,2110020002",
+				},
+			  ],
+			},
+			{
+			  title: "英短成猫专属",
+			  video: "/images/cat/four.mp4",
+			  catimage: "/images/cat/four.jpg",
+			  productimage: "/images/cat/star-4.png",
+			  detail: "增强肌肉质量 支持骨骼与关节健康",
+			  price: "¥183",
+			  productList: [
+				{
+				  productCode: "23040200,2304004003,2304020002,23040450,23041000",
+				},
+			  ],
+			}
+		],
+		doglistvideo: [
+		  {
+			title: "主食级狗湿粮",
+			video: "/images/dog/one.mp4",
+			catimage: "/images/dog/one.jpg",
+			productimage: "/images/dog/star-1.png",
+			detail: "柔软细腻慕斯 适合离乳期幼犬舔食",
+			price: "¥78",
+			productList: [
+			  {
+				productCode: "81220020F03,81220020F06,81220020F12",
+			  },
+			],
+		  },
+		  {
+			title: "贵宾成犬专属",
+			video: "/images/dog/two.mp4",
+			catimage: "/images/dog/two.jpg",
+			productimage: "/images/dog/star-2.png",
+			detail: "护肤靓毛 理想体态",
+			price: "¥241",
+			productList: [
+			  {
+				productCode: "14560300,1456030002,14560750",
+			  },
+			],
+		  },
+		  {
+			title: "小型犬成犬专属",
+			video: "/images/dog/three.mp4",
+			catimage: "/images/dog/three.jpg",
+			productimage: "/images/dog/star-3.png",
+			detail: "亮泽被毛 呵护牙齿",
+			price: "¥121",
+			productList: [
+			  {
+				productCode: "10030200,10030800,1003020002",
+			  },
+			],
+		  },
+		  {
+			title: "离乳期全价奶糕",
+			video: "/images/dog/four.mp4",
+			catimage: "/images/dog/four.jpg",
+			productimage: "/images/dog/star-4.png",
+			detail: "高易再水合颗粒 帮助增强保护健康成长",
+			price: "¥88",
+			productList: [
+			  {
+				productCode: "16220100,16220300,16221000,1622010002,1622030002,16220100F03,16220300F03",
+			  },
+			],
+		  },
+		],
+		amature:[
+			{
+			  title: "中型幼犬离乳期全价奶糕",
+			  productimage: "/images/dogfoot.png",
+			  detail: "中心犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长",
+			  ecPrice: "¥263",
+			  productCode:'17220400',
+			  productList: [
+			    {
+			      productCode: "17220400,17220100,17221000,1722040002",
+			    },
+			  ],
+			},
+			{
+			  title: "皇家离乳期幼猫全价奶糕",
+			  productimage: "/images/catfoot.png",
+			  detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量",
+			  ecPrice: "¥189",
+			  productCode:'20010200',
+			  productList: [
+			    {
+			      productCode: "20010200,2001020002,20010200F03,2001004003",
+			    },
+			  ],
+			},
+		]
+	};
+//Production data end
+let data = {
+	'development':devData,
+	'production':prdData
+};
+
+export default data;
\ No newline at end of file
diff --git a/rc-busness/nuxt.config.js b/rc-busness/nuxt.config.js
index 5b889a0c..9ee49b7f 100644
--- a/rc-busness/nuxt.config.js
+++ b/rc-busness/nuxt.config.js
@@ -1,7 +1,10 @@
 const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [];dataLayer.push({"user":{"sitecoreId":"00000000-0000-0000-0000-000000000000","locale":"zh-HK"},"session":{"id":"vvfwez43vfoomct4y3yqneqy"},"site":{"country":"HK","id":"RCGlobalMC1","environment":"prd"},"page":{"type":"Start of Life Page","hitTimestamp":"2020-10-16T16:26:21.7350880+00:00","topic":"Collecting your kitten and their first week with you","theme":"Cat"},"pet":{"specieId":"2"}});';
 const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;';
 export default {
-  
+  env: {
+      //NODE_ENV: 'development'
+	  NODE_ENV: 'production'
+  },
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
     title: '皇家宠物食品官方商城',
diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue
index 77977c08..cf50c3db 100644
--- a/rc-busness/pages/index.vue
+++ b/rc-busness/pages/index.vue
@@ -22,7 +22,7 @@
         </swiper-slide>
 
         <swiper-slide>
-				<a href="#" target="_blank">
+				<a @click="toMiniShop" target="_blank">
           <picture>
             <source
               media="(max-width: 768px)"
@@ -1032,12 +1032,23 @@
 	        </nuxt-link>
 	        </div> -->
 
-    <FixRight></FixRight>
+    <FixRight ref="fixRightComponent"></FixRight>
     <div v-if="!dataLoaded" class="ts-mask">
       <div class="ts-mask-bg"></div>
       <div class="userloding"></div>
       <span>数据加载中</span>
     </div>
+	<el-dialog :visible.sync="showMiniShopQr" :close-on-click-modal="false">
+	  <div class="rc-headera">
+	    <div class="rc-title">
+	      <img src="images/qrcode-wxgroup.jpg" alt="" style="margin:0 auto;"/>
+	    </div>
+	    <div class="rc-logmain rc-text--center">
+	      <h3>温馨提示</h3>
+	      <span>请使用微信扫描小程序码</span>
+	    </div>
+	  </div>
+	</el-dialog>
     <Myfooter></Myfooter>
   </div>
 </template>
@@ -1048,6 +1059,7 @@ import FixRight from "~/components/fixed-right.vue";
 import Myfooter from "~/components/rc-footer.vue";
 import unlogin from "~/components/unlogin.vue";
 import { mapMutations } from "vuex";
+import envData from "~/config/env-data.js";
 import {
   userquery,
   postCourseId,
@@ -1055,6 +1067,7 @@ import {
   userque,
   searchchanpin,
 } from "../ajax/getData";
+import util from "@/ajax/util";
 const settings = require("@/config");
 export default {
   middleware: "metaTitle",
@@ -1062,15 +1075,17 @@ export default {
   meta: { title: "首页" },
   data() {
     return {
+	  util,
+	  showMiniShopQr:false,
       fixedHeader: false,
       dataLoaded: true,
       usermargin: { marginTop: "0" },
       useraindex: 0,
+	  envData,
       indexacindex:0,
       mobileVideoPlaying: false,
       usertitle: "明星猫粮",
       dogtitle: "明星犬粮",
-      userdata:'999999',
       processinformation: [],
       catshi: [],
       userindex: 0,
@@ -1257,113 +1272,12 @@ export default {
         },
       ],
       catlistvideo: [
-        {
-          title: "主食级猫湿粮",
-          video: "/images/cat/one.mp4",
-          catimage: "/images/cat/one.jpg",
-          productimage: "/images/cat/star-1.png",
-          detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食",
-          price: "¥372",
-          productList: [
-            {
-              productCode: "80240008F24",
-            },
-          ],
-        },
-        {
-          title: "幼猫成长专属",
-          video: "/images/cat/two.mp4",
-          catimage: "/images/cat/two.jpg",
-          productimage: "/images/cat/star-2.png",
-          detail: "支持幼猫自身保护力 为快速生长提供足够能量",
-          price: "¥33",
-          productList: [
-            {
-              productCode: "20030040",
-            },
-          ],
-        },
-        {
-          title: "室内成猫专属",
-          video: "/images/cat/three.mp4",
-          catimage: "/images/cat/three.jpg",
-          productimage: "/images/cat/star-3.png",
-          detail: "高易消化蛋白 减少粪便量和异味",
-          price: "¥157",
-          productList: [
-            {
-              productCode: "21100200",
-            },
-          ],
-        },
-        {
-          title: "英短成猫专属",
-          video: "/images/cat/four.mp4",
-          catimage: "/images/cat/four.jpg",
-          productimage: "/images/cat/star-4.png",
-          detail: "增强肌肉质量 支持骨骼与关节健康",
-          price: "¥402",
-          productList: [
-            {
-              productCode: "23040450",
-            },
-          ],
-        },
+        
+
       ],
 
       doglistvideo: [
-        {
-          title: "主食级狗湿粮",
-          video: "/images/dog/one.mp4",
-          catimage: "/images/dog/one.jpg",
-          productimage: "/images/dog/star-1.png",
-          detail: "柔软细腻慕斯 适合离乳期幼犬舔食",
-          price: "¥359",
-          productList: [
-            {
-              productCode: "81220020F12",
-            },
-          ],
-        },
-        {
-          title: "贵宾成犬专属",
-          video: "/images/dog/two.mp4",
-          catimage: "/images/dog/two.jpg",
-          productimage: "/images/dog/star-2.png",
-          detail: "护肤靓毛 理想体态",
-          price: "¥562",
-          productList: [
-            {
-              productCode: "14200300",
-            },
-          ],
-        },
-        {
-          title: "小型犬成犬专属",
-          video: "/images/dog/three.mp4",
-          catimage: "/images/dog/three.jpg",
-          productimage: "/images/dog/star-3.png",
-          detail: "亮泽被毛 呵护牙齿",
-          price: "¥57",
-          productList: [
-            {
-              productCode: "16020080",
-            },
-          ],
-        },
-        {
-          title: "离乳期全价奶糕",
-          video: "/images/dog/four.mp4",
-          catimage: "/images/dog/four.jpg",
-          productimage: "/images/dog/star-4.png",
-          detail: "高易再水合颗粒 帮助增强保护健康成长",
-          price: "¥263",
-          productList: [
-            {
-              productCode: "17220400",
-            },
-          ],
-        },
+        
       ],
       rccontair: [
         {
@@ -1414,6 +1328,7 @@ export default {
         //       console.log("1");
         //     } 
 			 if (this.realIndex == 2) {
+
 			// 	setTimeout(() => {
 			//   var option = {
             //     customer: {
@@ -1492,52 +1407,56 @@ export default {
   },
   created() {
     vm = this;
+	let curEnv = process.env.NODE_ENV;
+	this.catlistvideo = envData[curEnv].catlistvideo;
+	this.doglistvideo = envData[curEnv].doglistvideo;
   },
   watch: {},
   mounted() {
-    this.checkIsLogin();
-     if(this.$store.state.userInfo===undefined){
-       this.userdata=' '
-     }else{
-     this.userdata = this.$store.state.userInfo.data.id;
-     }
-    console.log(this.userdata);
-    const that = this;
+	let popupMessage = this.$route.query.msg;
+	if(popupMessage) {
+		this.$message({
+		  type: 'success',
+		  message: popupMessage,
+		});
+	}
+	this.checkIsLogin();
 
-    this.ifAdoid();
-    this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
-    if (this.usermessage == null || this.usermessage == undefined) {
-      this.userunlogin = true;
-    }
-    window.addEventListener("scroll", this.handleScroll, true);
-    this.userchufang(); //查询处方粮商品信息
+	const that = this;
 
-    this.catmessage(); //查询猫的信息
-    this.catclickGan();
-    this.catclickShi();
+	this.ifAdoid();
+	this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
+	if (this.usermessage == null || this.usermessage == undefined) {
+	this.userunlogin = true;
+	}
+	window.addEventListener("scroll", this.handleScroll, true);
+	this.userchufang(); //查询处方粮商品信息
 
-    this.dogmessage(); //查询狗的信息
-    this.userdogShi();
-    this.userdogGan();
+	this.catmessage(); //查询猫的信息
+	this.catclickGan();
+	this.catclickShi();
+
+	this.dogmessage(); //查询狗的信息
+	this.userdogShi();
+	this.userdogGan();
   },
   destroyed() {
     window.removeEventListener("scroll", this.scrollToTop);
   },
   methods: {
-	  diaoqi(){
-
-			  var option = {
-                customer: {
-                  id: "",
-                  name: "",
-                  email: "", 
-                  mobile: "",
-                  memberId: this.userdata,
-                },
-              };
-              dis_livchat(option);
-	  },
-    ...mapMutations(["checkIsLogin"]),
+	...mapMutations(["checkIsLogin"]),
+	diaoqi(){
+		this.$refs['fixRightComponent'].lianxi({title:'营养专家'});
+	},
+	toMiniShop(){
+		let isMobile = this.util.isMobile();
+		if(isMobile) {
+			window.location.href="https://miniapp-product.royalcanin.com.cn/rcmini2020/admin/Voucher/urlRedirect.html";
+		} else {
+			this.showMiniShopQr=true;
+			// /images/qrcode-minishop.png
+		}
+	},
     playMobileVideo(item) {
       let videoPath = item.video;
       let player = this.$refs["mobile-video-player"];
@@ -1944,7 +1863,7 @@ export default {
       if (!item) item = this.discounchufang[0].title;
       this.dataLoaded = false;
       let list = [];
-      let data = await userque(item, 1, 8);
+      let data = await userque(item, '', 1, 8);
       if (data) {
         list = data.slice(0, 8);
         this.processinformation = list;
@@ -1971,7 +1890,7 @@ export default {
     catclickGan() {
       this.userstype = 0;
       this.maoganCurIndex = this.maoganCurIndex ? this.maoganCurIndex : 0;
-      let apiCatAgeType = this.discoun[this.maoshiCurIndex].title;
+      let apiCatAgeType = this.discoun[this.maoganCurIndex].title;
       let petType = {
         petType: 0,
         tagStatus: 1, //干
diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue
index 0e5a1ae2..2df60d1e 100644
--- a/rc-busness/pages/myorder/usertion.vue
+++ b/rc-busness/pages/myorder/usertion.vue
@@ -118,7 +118,7 @@
             </li>
             <li>
               <span>付款方式:</span>
-              <i>{{ information.paytype }}</i>
+              <i>{{ information.paytypeText }}</i>
             </li>
             <li>
               <span>配送方式:</span>
@@ -158,7 +158,18 @@
         {{ payorsucess }}
       </i>
     </div>
-
+	
+	<el-dialog :visible.sync="showPaytypeWarning" :close-on-click-modal="false">
+	  <div class="ts-warning-popup">
+	    <div class="title rc-full-width">
+	      <img src="../../assets/error.png" alt="" />
+	    </div>
+	    <div class="content rc-full-width rc-text--center rc-margin-y--md">
+	      <h3>温馨提示</h3>
+	      <span class="">{{ paytypeWarning.message}}</span>
+	    </div>
+	  </div>
+	</el-dialog>
     <MyFooter></MyFooter>
   </div>
 </template>
@@ -184,6 +195,8 @@ export default {
   data() {
     return {
 	  util,
+	  paytypeWarning:{result:true,message:''},
+	  showPaytypeWarning:false,
       goldmedal: [],
       userproductId: "",
       logisticsDate: "",
@@ -214,12 +227,9 @@ export default {
 		useraddress: [],
 		shopprice: {},
 		information: {
-		reference: "1111111111111111",
-		ordertime: "2012-12-01    11:20:00",
-		paytype: "微信支付",
-		distribution: "快递",
-		trackingnumber: "11111111111111",
-		catimage: require("../../assets/image/rc-left.png"),
+			paytypeText: "",
+			distribution: "快递",
+			catimage: require("../../assets/image/rc-left.png"),
       },
     };
   },
@@ -267,16 +277,20 @@ export default {
     },
     //订单支付和再次购买
 	onceagain(item) {
-		if (this.payorsucess == "立即支付") {
-			this.getwei(item);
-		} else {
-			this.$router.push({
-				path: "/productdetails/producted",
-				query: {
-					stype: 1,
-					productCode: this.userproductId,
-				},
-			});
+		this.paytypeWarning = this.util.checkPaytypeValidated(this.paytype);
+		this.showPaytypeWarning = !this.paytypeWarning.result;
+		if(this.paytypeWarning.result) {
+			if (this.payorsucess == "立即支付") {
+				this.getwei(item);
+			} else {
+				this.$router.push({
+					path: "/productdetails/producted",
+					query: {
+						stype: 1,
+						productCode: this.userproductId,
+					},
+				});
+			}
 		}
 	},
     async orderquantity(orderNumber) {
@@ -304,7 +318,8 @@ export default {
 			this.usersalesAmount = this.goldmedal[i].salesAmount;
 			this.addressUserName = this.goldmedal[i].addressUserName;
 			this.addressPhoneNumber = this.goldmedal[i].addressPhoneNumber;
-			this.paytype = (this.goldmedal[i].paytype=="1"?'微信支付':'支付宝');
+			this.paytype = this.goldmedal[i].paytype;
+			this.information.paytypeText = this.util.getTextByPaytype(this.paytype);
         }
       }
     },
diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
index fd34793b..7d7c4572 100644
--- a/rc-busness/pages/personal/discount.vue
+++ b/rc-busness/pages/personal/discount.vue
@@ -34,7 +34,7 @@
 						￥
 					</i>
 					<span>
-						{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
+						{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
 					</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>
@@ -43,7 +43,7 @@
                 <i  :style='usercolor'>
                   {{ item.couponDesc }}
                 </i>
-                <div class="rc-userfont">
+                <div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
                     <strong>有效期</strong>
                   <span>{{item.validFrom}}至</span>
                   <em>{{item.validTo}}</em>
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 52022db4..88466d22 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -167,7 +167,7 @@
 						￥
 					</i>
 					<span>
-						{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
+						{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
 					</span>
 				</div>
 				<strong>{{ item.couponName }}</strong>
@@ -176,7 +176,7 @@
 				<i  :style='usercolor'>
 				  {{ item.couponName }}
 				</i>
-				<div class="rc-userfont">
+				<div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
 					<strong>有效期</strong>
 				  <span>{{item.validFrom}}至</span>
 				  <em>{{item.validTo}}</em>
@@ -287,12 +287,13 @@ export default {
 			checkResult = false;
 		}
 		if(checkResult) {
+			this.discountedProductCode = this.goldmedal[0].productCode
 			if(this.curCoupon.couponAmount && this.curCoupon.couponAmount>0) {
 				this.discountAmount = this.curCoupon.couponAmount;
 				return this.sumPrice - this.curCoupon.couponAmount;
 			} else if(this.curCoupon.discount && this.curCoupon.discount>0) {
 				this.discountAmount = this.sumPrice*this.curCoupon.discount;
-				return this.sumPrice * (1-this.curCoupon.discount);
+				return this.sumPrice * ( 1 - this.curCoupon.discount );
 			}
 		} else {
 			return this.sumPrice;
@@ -330,8 +331,8 @@ export default {
 							break;
 						case 3: //Limited product % discount
 						case 4: //% discount
-							total = total + (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
-							this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount);
+							total = total + (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount );
+							this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
 							this.discountedProductCode = itemInCart.productCode;
 							couponUsed=true;
 							break;
@@ -375,7 +376,7 @@ export default {
 	userget(){
 		let user = this.$store.state.userInfo;
 		if (user) {
-		  this.userdraw(user.data.mobile);
+		  //this.userdraw(user.data.mobile);
 		  this.dialogInfo1 = true;
 		} else {
 			this.$router.push({
@@ -391,7 +392,7 @@ export default {
 	  let valDateFromTime=0;
 	  let valDateToTime=0;
 	  let dateChecked=true;
-	  
+	  let avaliableCouponNum = 0;
 	  if (data) {
 		this.drawlist=[];
 		for(let itemInCart of this.goldmedal) {
@@ -422,10 +423,14 @@ export default {
 				if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) {
 					data.data.splice(tmpIndex,1);
 					_self.drawlist.push(myCoupon);
+					avaliableCouponNum++;
 				}
 				tmpIndex++;
 			}
 		}
+		if(avaliableCouponNum > 0) {
+			this.curCoupon.couponName = '有 '+avaliableCouponNum+' 张优惠券可以使用';
+		}
 	  }
 	},
 	pickCoupon(item){
@@ -513,28 +518,28 @@ export default {
       let postData = [];
 	  let tmpCounter=0;
       this.goldmedal.forEach((item) => {
-		  let basePoint = (item.basePoint?item.basePoint:0);
+		let basePoint = (item.basePoint?item.basePoint:0);
         let oneProduct = {
-		  basePoint:basePoint,
-          productName: item.productName,
-          buyCount: item.buyCount,
-          productCode: item.productCode,
-          payAmount: item.productPrice,
-          memberId: userInfo.data.id,
-          phoneNumber: userInfo.data.mobile,
-          // couponId: "NGQ2022P12",
-          // couponTypeId: "4",
-          // couponName: "内购券",
-          // couponAmount: "0.3175",
-          // couponCode: "0007792402",
-          orderAddress: {
-            addressPhoneNumber: orderAddress[0].recipientPhone,
-            addressUserName: orderAddress[0].recipient,
-            addressProvinceName: orderAddress[0].provinceName,
-            addressCityName: orderAddress[0].cityName,
-            addressCountyName: orderAddress[0].districtName,
-            addressDetailInfo: orderAddress[0].detailAddress,
-          },
+			basePoint:basePoint,
+			productName: item.productName,
+			buyCount: item.buyCount,
+			productCode: item.productCode,
+			payAmount: item.productPrice,
+			memberId: userInfo.data.id,
+			phoneNumber: userInfo.data.mobile,
+			// couponId: "NGQ2022P12",
+			// couponTypeId: "4",
+			// couponName: "内购券",
+			// couponAmount: "0.3175",
+			// couponCode: "0007792402",
+			orderAddress: {
+				addressPhoneNumber: orderAddress[0].recipientPhone,
+				addressUserName: orderAddress[0].recipient,
+				addressProvinceName: orderAddress[0].provinceName,
+				addressCityName: orderAddress[0].cityName,
+				addressCountyName: orderAddress[0].districtName,
+				addressDetailInfo: orderAddress[0].detailAddress,
+			},
         };
 		if(this.curCoupon.couponId && item.productCode == this.discountedProductCode) {
 			oneProduct.couponId = this.curCoupon.couponId;
@@ -626,6 +631,22 @@ export default {
     this.getAddressList();
 	this.checkIsLogin();
 	this.finalAmount = this.sumPrice;
+	this.goldmedal.forEach((item) => {
+		_hmt.push([
+		    "_trackCustomEvent",
+		    "placing_order",
+		    {
+				"product_id":item.productCode,
+				"product_name": item.productName,
+				"product_quantity" : item.buyCount,
+				"product_amount" : item.buyCount*item.productPrice,
+		    }
+		])
+	});
+	let user = this.$store.state.userInfo;
+	if(user) {
+		this.userdraw(user.data.mobile);
+	}
     // this.addressstype = this.$route.query.stype;
     // this.orderNumber = this.$route.query.orderNumber;
     // this.canceldanhao(this.orderNumber);
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index 956a4e5a..46566de4 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -132,7 +132,18 @@
  
       </div>
     </div>
-      <MyFooter></MyFooter>
+	<el-dialog :visible.sync="showPaytypeWarning" :close-on-click-modal="false">
+	  <div class="ts-warning-popup">
+	    <div class="title rc-full-width">
+	      <img src="../../assets/error.png" alt="" />
+	    </div>
+	    <div class="content rc-full-width rc-text--center rc-margin-y--md">
+	      <h3>温馨提示</h3>
+	      <span class="">{{ paytypeWarning.message}}</span>
+	    </div>
+	  </div>
+	</el-dialog>
+	<MyFooter></MyFooter>
   </div>
 </template>
 
@@ -146,6 +157,8 @@ export default {
   data() {
     return {
 	  util,
+	  paytypeWarning:{result:true,message:''},
+	  showPaytypeWarning:false,
 	  crumbs:[
 		{
 			path:'/personal/mypersonal/',
@@ -279,7 +292,6 @@ export default {
     this.userdata = user.data.mobile;
     let stype = this.$route.query.stype;
     this.userstype=this.$route.query.stype;
-    console.log(stype);
     if (user == "" || user == null) {
       this.$message({
         type: "warning",
@@ -297,68 +309,62 @@ export default {
   },
   methods: {
     async indet(mobile, stype) {
-      let data = await userindent(mobile,undefined,1,100);
-      this.activeIndex = stype;
-      this.goldmedal = data;
-      this.alllist=[];
-      this.useralllist=[];
-      this.obligation=[];
-      this.receiving=[];
-      this.pending=[];
-      for (let i = 0; i < this.goldmedal.length; i++) {
-        this.useralllist.push(this.goldmedal[i].orderDetailList[0]);
-         this.alllist.push(this.goldmedal[i].orderDetailList[0])
-        this.allmessage.push(this.goldmedal[i].orderDetailList[0])
-        if(this.goldmedal[i].status==0){
-          this.obligation.push(this.goldmedal[i].orderDetailList[0]);
-        }else if(this.goldmedal[i].status==1){
-          this.receiving.push(this.goldmedal[i].orderDetailList[0]);
-        }
-        else if(this.useralllist[i].status==2){
-          this.pending.push(this.goldmedal[i].orderDetailList[0]);
-        }
-      }
-        for (var i = 0; i < this.useralllist.length; i++) {
-        this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
-        this.useralllist[i].status = this.goldmedal[i].status;
-         this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName;
-           this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber;
-        this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
-          //  this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径
-          //  this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称
-          //   this.useralllist[i].ecPrice=this.goldmedal[i].ecPrice//第一个的单价
-          //    this.useralllist[i].pcs=this.goldmedal[i].pcs//数量
+		let data = await userindent(mobile,undefined,1,100);
+		this.activeIndex = stype;
+		this.goldmedal = data;
+		this.alllist=[];
+		this.allmessage=[];
+		this.useralllist=[];
+		this.obligation=[];
+		this.receiving=[];
+		this.pending=[];
+		for (let i = 0; i < this.goldmedal.length; i++) {
+			this.useralllist.push(this.goldmedal[i].orderDetailList[0]);
+			this.alllist.push(this.goldmedal[i].orderDetailList[0])
+			this.allmessage.push(this.goldmedal[i].orderDetailList[0])
+			if(this.goldmedal[i].status==0){
+				this.obligation.push(this.goldmedal[i].orderDetailList[0]);
+			}else if(this.goldmedal[i].status==1){
+				this.receiving.push(this.goldmedal[i].orderDetailList[0]);
+			}
+			else if(this.goldmedal[i].status==2){
+				this.pending.push(this.goldmedal[i].orderDetailList[0]);
+			}
+		}
+		for (let i = 0; i < this.goldmedal.length; i++) {
+			this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
+			this.useralllist[i].status = this.goldmedal[i].status;
+			this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName;
+			this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber;
+			this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
+			this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length;
+			this.useralllist[i].paytype=this.goldmedal[i].paytype;
+		}
+		if(this.userstype==1){
+			this.useralllist=this.obligation
+		}else if(this.userstype==2){
+			this.useralllist=this.pending
+		}
+		else if(this.userstype==0){
+			this.useralllist=this.allmessage
+		}
+		else if(this.userstype==3){
+			this.useralllist=this.receiving
+		}
 
-
-        this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
-      }
-      console.log(this.obligation)
-         if(this.userstype==1){
-         this.useralllist=this.obligation
-       }else if(this.userstype==2){
-           this.useralllist=this.pending
-       }
-       else if(this.userstype==0){
-           this.useralllist=this.allmessage
-       }
-         else if(this.userstype==3){
-           this.useralllist=this.receiving
-       }
-    
     
     },
-
 	//订单立即支付
 	async getwei(item) {
-		let data = await this.repayOrde(item.orderNumber);
+		let payType = this.util.pickPaytype();
+		let data = await this.repayOrde(item.orderNumber, payType);
 		if(data.code==1) {
 			let userPayData = {
-				userprice: item.usersalesAmount,
+				userprice: item.salesAmount,
 				orderId: item.orderNumber,
-				userinformation: item.addressUserName + " " + item.addressPhoneNumber,
+				userinformation: item.addressUserName + " " + item.phoneNumber,
 				wxPay:data.msg
 			};
-
 			this.$router.push({
 				path: "/personal/userpay",
 				query: {
@@ -443,51 +449,49 @@ export default {
       }
     },
     selectGoods(item, index) {
-      let list=[]
-      this.activeIndex = index;
-      console.log(this.obligation)
-      if(item.title=='待付款'){
-        list=this.obligation
-      }
-      else if(item.title=='待收货'){
-       list=this.receiving
-       console.log(this.receiving);
+		let list=[]
+		this.activeIndex = index;
+		if(item.title=='待付款'){
+			list=this.obligation
+		}
+		else if(item.title=='待收货'){
+			list=this.receiving
+		}else if(item.title=='待发货'){
+			this.useralllist=this.pending
+			list=this.pending
+		}
 
-      }else if(item.title=='待发货'){
-        this.useralllist=this.pending
-        list=this.pending
-      }
-
-      else if(item.title=='全部'){
-         list=this.alllist
-      }
-     this.useralllist=[];
-     console.log(this.useralllist,list);
-              for (var i = 0; i < this.useralllist.length; i++) {
-        this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber;
-        this.useralllist[i].status = this.goldmedal[i].status
-         this.useralllist[i].addressUserName =this.goldmedal[i].addressUserName;
-           this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber;
-        this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
-        this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
-      }
-      this.useralllist=list
-   
-    },
-    userfind(item) {
-      if(item.status==0){
-        this.getwei(item);
-      }else{
-             this.$router.push({
-        path: "/myorder/usertion",
-        query: {
-          stype: item.status,
-          orderNumber: item.orderNumber,
-        },
-      });
-      }
-  
+		else if(item.title=='全部'){
+			list=this.alllist
+		}
+		this.useralllist=[];
+		for (var i = 0; i < this.useralllist.length; i++) {
+			this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber;
+			this.useralllist[i].status = this.goldmedal[i].status
+			this.useralllist[i].addressUserName =this.goldmedal[i].addressUserName;
+			this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber;
+			this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
+			this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
+		}
+		this.useralllist=list
     },
+	userfind(item) {
+		this.paytypeWarning = this.util.checkPaytypeValidated(item.paytype);
+		this.showPaytypeWarning = !this.paytypeWarning.result;
+		if(this.paytypeWarning.result) {
+			if(item.status==0){
+				this.getwei(item);
+			}else{
+				this.$router.push({
+					path: "/myorder/usertion",
+					query: {
+						stype: item.status,
+						orderNumber: item.orderNumber,
+					},
+				});
+			}
+		}
+	},
     usertwo() {
       this.$router.push({
         path: "/myorder/userrecord",
diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue
index 00a0e599..5746e85d 100644
--- a/rc-busness/pages/personal/userpay.vue
+++ b/rc-busness/pages/personal/userpay.vue
@@ -175,6 +175,14 @@ export default {
 				//TODO raise WX jsapi pay
 				break;
 		}
+		_hmt.push([
+		    "_trackCustomEvent",
+		    "payment",
+		    {
+				"payType" : payType,
+				"product_amount" : this.userPayData.userprice,
+		    }
+		])
 	},
 	goPayH5() {
 		let isMobile = this.util.isMobile();
@@ -228,7 +236,14 @@ export default {
       if (res.success) {
         this.qrtext = '成功加入群的二维码';
         this.dialogSuccess = true;
-
+		_hmt.push([
+		    "_trackCustomEvent",
+		    "payment_finished",
+		    {
+				"payType" : 'native',
+				"product_amount" : this.userPayData.userprice,
+		    }
+		])
       } else if (res.fail)  {
         this.dialogFail = true;
 
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index 5f92ae55..44434f2a 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/rc-busness/pages/productdetails/producted.vue
@@ -1,793 +1,733 @@
-<template>
-  <div>
-    <div class="user">
-      <Myheader></Myheader>
-      <div class="rc-top"></div>
-      <tabs :crumbs="crumbs"></tabs>
-      <div class="online rc-margin--none" id="fixed-catbar-seperator"></div>
-      <div class="rc-top"></div>
-      <div
-        class="
-          rc-usermain
-          ts-product-detail
-          rc-max-width--xl
-          rc-layout-container rc-two-column rc-border-bottom
-          rc-border-colour--brand4
-        "
-      >
-        <div class="uservideo" v-if="videoshow">
-          <video controls="" preload="videoimg">
-            <source :src="videolist" type="video/mp4" />
-          </video>
-        </div>
-        <div class="rc-column" v-if="!videoshow">
-          <div data-js-carousel="" data-image-gallery="true">
-            <div
-              class="rc-carousel rc-carousel__gallery-image"
-              data-zoom-container="328b2e5f-6904-4cac-9709-51ed18d2500f"
-              data-zoom-factor="2"
-            >
-              <!-- Big images-->
-              <div v-for="(item, index) in productAttachmentList" :key="index">
-                <div>
-                  <img :src="item.attachmentPath" />
-                  <!-- <img
-                    src="https://cdn.royalcanin-weshare-online.io/m2kia2QBG95Xk-RBC8jn/v1/medium-maxi-giant-pos-2012-packshots-ma-ad-shn-packshot?w=420&fm=jpg&auto=compress"
-                    alt="Product alt text"
-                  /> -->
-                </div>
-              </div>
-
-              <!-- <div>
-			  <div>
-				  <img src="https://cdn.royalcanin-weshare-online.io/m2kia2QBG95Xk-RBC8jn/v1/medium-maxi-giant-pos-2012-packshots-ma-ad-shn-packshot?w=420&fm=jpg&auto=compress" alt="Product alt text" />
-			  </div>
-			</div> -->
-              <!-- Big images end-->
-            </div>
-            <div class="rc-carousel__gallery-thumbnails-wrapper">
-              <div class="rc-carousel rc-carousel__gallery-thumbnails">
-                <!-- Thunb images-->
-                <div
-                  class="
-                    rc-carousel__gallery-thumbnail
-                    tns-item tns-slide-active
-                  "
-                  v-for="(item, index) in productAttachmentList"
-                  :key="index"
-                >
-                  <div class="rc-img--square">
-                    <img :src="item.attachmentPath" />
-                  </div>
-                </div>
-                <!-- <div class="rc-carousel__gallery-thumbnail">
-                  <figure
-                    class="rc-img--square"
-                    style="
-                      background-image: url('https://cdn.royalcanin-weshare-online.io/m2kia2QBG95Xk-RBC8jn/v1/medium-maxi-giant-pos-2012-packshots-ma-ad-shn-packshot?w=64&fm=jpg&auto=compress');
-                    "
-                  >
-                    <figcaption class="rc-screen-reader-text">
-                      Product caption text
-                    </figcaption>
-                  </figure>
-                </div>
-                <div class="rc-carousel__gallery-thumbnail">
-                  <figure
-                    class="rc-img--square"
-                    style="
-                      background-image: url('https://cdn.royalcanin-weshare-online.io/UCEUa2QBaxEApS7L_-Xz/v2/fbn-2013-graphiccodes-packshots-siam-ad-int-fbn-packshot?w=64&fm=jpg&auto=compress');
-                    "
-                  >
-                    <figcaption class="rc-screen-reader-text">
-                      Product caption text
-                    </figcaption>
-                  </figure>
-                </div> -->
-                <!-- Thunb images end-->
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div
-          class="ts-product-header rc-column"
-          id="328b2e5f-6904-4cac-9709-51ed18d2500f"
-        >
-          <div class="usermain">
-            <div class="online bold rc-md-down"></div>
-            <div class="rc-main">
-              <div class="rc-title">
-                <h2>{{ curItem.brandName + " " + curItem.productName }}</h2>
-              </div>
-            </div>
-            <div class="online rc-md-down"></div>
-            <div class="rc-main">
-              <div class="productdetails">
-                <div class="rc-productdetail" v-if="!userbuy">
-                  <i class="ts-row-title">适用年龄：</i>
-                  <span>{{ curItem.tagUsedAge }}</span>
-                </div>
-                <div class="rc-productdetail" v-if="!userbuy">
-                  <i class="ts-row-title">所属分类：</i>
-                  <span>{{ curItem.categoryName }}</span>
-                </div>
-                <div class="rc-button" v-if="userloginbuy">
-                  <span @click="chuafangbuy()">立即购买</span>
-                </div>
-
-                <div class="rc-productdetail" v-if="userbuy">
-                  <i class="ts-row-title">商品价格：</i>
-                  <span class="ts-realprice">￥{{ curItem.ecPrice }}</span>
-                  <span class="ts-remove ts-ecprice">￥{{ curItem.rsp }} </span>
-                  <span class="ts-record" v-if="curItem.basePoint !== 0">
-                    购买该商品你将获得{{ curItem.basePoint }}积分
-                  </span>
-
-                  <!-- <span class="rc-title">购买该商品你将得到22积分</span> -->
-                </div>
-                <div class="rc-productdetai" v-if="userbuy">
-                  <div>
-                    <i class="ts-row-title">活动促销：</i>
-                    <span>全场商品限时优惠</span>
-                  </div>
-                  <em class="ts-right-arr" @click="userget()">立即领取</em>
-                </div>
-              </div>
-            </div>
-            <div class="online bold rc-md-down"></div>
-            <div class="rc-main rc-md-up" v-if="userbuy">
-              <div class="online"></div>
-            </div>
-
-            <div class="rc-productdeta" v-if="userbuy">
-              <div class="rc-main">
-                <div class="rc-prodtop">
-                  <div>
-                    <i class="ts-row-title">商品规格：</i>
-                  </div>
-                  <div class="ts-tag-list">
-                    <em
-                      v-for="(item, index) in newlist"
-                      :key="index"
-                      @click="selectsearch(item, index)"
-                      :class="[
-                        activeIndexa == index && item.leftAllotment > 0
-                          ? 'active'
-                          : 'unactive',
-                        item.leftAllotment > 0 ? '' : 'disabled',
-                      ]"
-                    >
-                      {{ item.specifications }}
-                    </em>
-                  </div>
-                  <!-- 一个标品有多个商品, 每个商品有不同的价格
-				<em class="active">
-					{{ item.specifications }}
-				</em>
-				-->
-                </div>
-              </div>
-              <div class="rc-main">
-                <div
-                  class="rc-produnnum"
-                  v-if="userbuy && curItem.leftAllotment > 0"
-                >
-                  <div><i class="ts-row-title">商品数量：</i></div>
-                  <img
-                    src="../../assets/image/userjian.png"
-                    alt=""
-                    @click="sub()"
-                  />
-                  <strong>{{ sales_num }}</strong>
-                  <img
-                    src="../../assets/image/userjia.png"
-                    alt=""
-                    @click="plus()"
-                  />
-                </div>
-              </div>
-              <div class="rc-main rc-md-up" v-if="userbuy">
-                <div class="online"></div>
-              </div>
-              <div class="online rc-md-down"></div>
-              <div class="rc-main">
-                <div class="certification">
-                  <ul>
-                    <li>
-                      <span
-                        ><i class="ts-row-title">服务说明：</i
-                        ><i
-                          >当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解)</i
-                        ></span
-                      >
-                    </li>
-                    <li>
-                      <span
-                        ><i class="ts-row-title">商品运费：</i
-                        ><i>全场包邮(港澳除外)</i></span
-                      >
-                    </li>
-
-                    <li>
-                      <span
-                        ><i class="ts-row-title">商品编号：</i
-                        ><i>{{ curItem.productCode }}</i></span
-                      >
-                    </li>
-                  </ul>
-                </div>
-                <div
-                  class="rc-button"
-                  v-if="userbuy && curItem.leftAllotment > 0"
-                >
-                  <span @click="usertanchu(curItem, 0)">加入购物车</span>
-                  <span @click="usertanchu(curItem, 1)">立即购买</span>
-                </div>
-              </div>
-              <div class="online bold rc-md-down"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="rc-footimage rc-padding--sm rc-max-width--lg">
-        <img :src="curItem.showImgFile" alt="" />
-      </div>
-      <FixRight></FixRight>
-      <Myfooter v-on:litentop="showmesg"></Myfooter>
-    </div>
-    <el-dialog
-      :visible.sync="dialogInfo1"
-      @close="userclose"
-      class="pop_coupon"
-      :close-on-click-modal="false"
-    >
-      <div class="ts-no-data" v-if="usernewlist.length <= 0">
-        目前还没有可用的优惠券
-      </div>
-      <div class="rs-dis">
-        <div
-          class="rc-discount"
-          v-for="(item, index) in usernewlist"
-          :key="index"
-        >
-          <img :src="userimage" alt="" />
-          <div class="rc-contair">
-            <div class="rc-left">
-              <div>
-                <i v-if="item.couponTypeId != '4' && item.couponAmount > 0">
-                  ￥
-                </i>
-                <span>
-                  {{
-                    item.couponAmount
-                      ? item.couponAmount
-                      : parseInt(item.discount * 10) + "折"
-                  }}
-                </span>
-              </div>
-              <strong>{{ item.couponName }}</strong>
-            </div>
-            <div class="rc-right">
-              <i>
-                {{ item.couponName }}
-              </i>
-              <div class="rc-userfont">
-                <strong>有效期</strong>
-                <span>{{ item.validFrom }}至</span>
-                <em>{{ item.validTo }}</em>
-              </div>
-              <div class="rc-footer">
-                <span @click="usergetconf(item)">立即领取</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogInfo2" @close="userclose">
-      <div class="rc-headera">
-        <div class="rc-title">
-          <img src="../../assets/error.png" alt="" />
-        </div>
-        <div class="rc-logmain">
-          <h3>温馨提示</h3>
-          <span>请先点击下方进行登录/注册</span>
-        </div>
-        <nuxt-link :to="`/userlogin/login/`">
-          <div class="userer">
-            <span>立即登录</span>
-          </div>
-        </nuxt-link>
-      </div>
-    </el-dialog>
-    <div
-      class="rc-button rc-md-down"
-      v-if="userbuy && curItem.leftAllotment > 0"
-    >
-      <span @click="usertanchu(curItem, 0)">加入购物车</span>
-      <span @click="usertanchu(curItem, 1)">立即购买</span>
-    </div>
-    <div class="rc-button rc-md-down" v-if="userloginbuy">
-      <span @click="chuafangbuy()" style="margin-right: 20px">立即购买</span>
-    </div>
-  </div>
-</template>
-
-<script>
-import Myheader from "~/components/header.vue";
-import tabs from "@/components/tabs.vue";
-import FixRight from "~/components/fixed-right.vue";
-import unlogin from "~/components/unlogin.vue";
-import Myfooter from "~/components/rc-footer.vue";
-import { mapMutations } from "vuex";
-const settings = require("@/config");
-import {
-  goodsmessage,
-  getConfig,
-  postCourseId,
-  getdraw,
-  alldiscount,
-  oncequery,
-  biaomessage,
-} from "../../ajax/getData";
-
-export default {
-  async asyncData(context) {
-    let isRxGoods = context.route.query.isRxGoods;
-    let userbuy = true;
-    let newlist = [];
-    let curItem = {};
-    let chufang = {};
-    let videolist = [];
-    let productAttachmentList = [];
-    let userlistmenu = [];
-    isRxGoods = isRxGoods == "1" ? true : false;
-    let mainProductCode = context.route.query.mainProductCode;
-    let productCode = context.route.query.productCode;
-    let activeIndexa = 0;
-    if (!productCode || productCode.length <= 0)
-      throw new Error("Empty product code");
-    productCode = productCode.split(",");
-    // console.log(this.productCode);
-    if (isRxGoods) {
-      let data = await oncequery(mainProductCode);
-      let outputObj = {};
-      if (data) {
-        chufang = data;
-        outputObj = data;
-        outputObj.productName = data.name;
-        outputObj.picture =
-          "https://royalcanincn.escase.cn/jc/royalcanin/" + outputObj.picture;
-        outputObj.showImgFile =
-          "https://royalcanincn.escase.cn/jc/royalcanin/" +
-          outputObj.showImgFile;
-        newlist = [outputObj];
-        curItem = outputObj;
-      }
-      let insertTmpObj = {
-        id: 1,
-        attachmentType: 1,
-        sort: 1,
-        attachmentPath: newlist[0].picture,
-      };
-      productAttachmentList = [insertTmpObj];
-      userbuy = false;
-      console.log(curItem);
-      //  debugger
-
-      console.log("这是处方量数据");
-    } else {
-      let stopLeftAllotmentChecking = false;
-      let stopIndex = 0;
-      for (let singleCode of productCode) {
-        let data = await goodsmessage(singleCode);
-        if (data && data.data.length > 0) {
-          newlist.push(data.data[0]);
-
-          if (data.data[0].leftAllotment > 0 && !stopLeftAllotmentChecking) {
-            activeIndexa = stopIndex;
-            curItem = data.data[0];
-            stopLeftAllotmentChecking = true;
-          }
-          stopIndex++;
-        }
-      }
-      if (curItem.productAttachmentList != undefined)
-        productAttachmentList = curItem.productAttachmentList;
-      let list = [];
-
-      if (curItem.productName == undefined) curItem = newlist[0];
-      userbuy = true;
-    }
-    if (!curItem || curItem.productName == undefined)
-      throw new Error("商品信息错误");
-    let crumbs = [
-      {
-        path: "/productdetails/productlist/",
-      },
-      {
-        title: curItem.productName,
-      },
-    ];
-
-    return {
-      crumbs,
-      activeIndexa,
-      curItem,
-      newlist,
-      chufang,
-      videolist,
-      productAttachmentList,
-      userbuy,
-    };
-  },
-  data() {
-    return {
-      tableLabelTest: [],
-      userimage: require("../../assets/image/unused.png"),
-      gotop: false,
-      dialogInfo1: false,
-      videolist: [],
-      videoimg: "",
-      videoshow: false,
-      name: [],
-      userloginbuy: false,
-      userlist: [],
-      drawlist: [], //用户可以领取的优惠券
-      alldraw: [],
-      userlistmenu: [],
-      msg: ["11111111"],
-      parent_msg: ["111"],
-      usermessage: [],
-      dialogInfo2: false,
-      productCode: "", //商品code
-      productlist: [],
-      userbuy: true,
-      sales_num: 1,
-
-      productAttachmentList: [],
-      usernewlist: [
-        {
-          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"),
-        },
-      ],
-
-      newlist: [
-        {
-          price: "167.00",
-          pricestype: "英国短毛猫成猫全价湿粮",
-          special: "限时折扣全场商品8折",
-          period: "今晚20:00前付款，明日12:00前发货",
-          starttime: "商品未满199元  快递费:9.00元",
-          shangbianhao: "6212263798102432",
-          catimage: require("../../assets/image/rc-new.png"),
-        },
-      ],
-      stype: [
-        {
-          title: "3kg",
-        },
-        {
-          title: "5kg",
-        },
-      ],
-    };
-  },
-
-  components: {
-    Myheader,
-    tabs,
-    unlogin,
-    Myfooter,
-    FixRight,
-  },
-  //  middleware: 'metaTitle',
-  //   // middleware: 'metaTitle',
-  // meta: {title: '产品详情'},
-
-  mounted() {
-    this.checkIsLogin();
-    console.log(this.curItem);
-    if(!this.userbuy){
-   if (this.curItem.goodUrl.includes("pages")) {
-      this.userloginbuy = false;
-      console.log("------");
-    } else {
-      this.userloginbuy = true;
-      console.log("-22222222");
-    }
-    }
- 
-    if (this.usermessage !== "" || this.usermessage.data !== undefined) {
-      this.usermessage = this.$store.state.userInfo;
-      this.productCode = this.$route.query.productCode;
-      //video显示
-      this.productAttachmentList.map((element) => {
-        if (
-          element.attachmentPath.substring(
-            element.attachmentPath.lastIndexOf(".") + 1
-          ) == "mp4"
-        ) {
-          this.videolist = element.attachmentPath;
-        }
-      });
-      this.videoimg = this.productAttachmentList[0].attachmentPath;
-      if (this.videolist.length > 0) {
-        this.videoshow = true;
-      } else {
-        this.videoshow = false;
-      }
-
-      /*
-      let stype = this.$route.query.stype;
-	  let isRxGoods = this.$route.query.isRxGoods;
-	  isRxGoods = (isRxGoods == '1'?true:false);
-	  if(isRxGoods){
-		this.rxquery(this.productCode);
-		this.userbuy = false;
-	  } else {
-		this.userquery(this.productCode);
-		this.userbuy = true;
-	  }
-	  */
-    }
-  },
-  methods: {
-    ...mapMutations(["changemessage", "checkIsLogin"]),
-    showmesg() {
-      this.toTop();
-    },
-    //领取优惠券
-    usergetconf(item) {
-      console.log(item);
-      if (this.usermessage.data !== "" || this.usermessage.data !== undefined) {
-        this.getconf(this.usermessage.data.id, item.couponId);
-      }
-    },
-
-    //获取用户领取的优惠券
-    async getconf(memberId, couponId) {
-      let data = await getConfig(memberId, couponId);
-      let msg = "领取成功";
-      if (data) {
-        if (data.code != "0") msg = data.msg;
-        this.$message({
-          type: "warning",
-          message: msg,
-        });
-      }
-    },
-    //处方用粮跳转
-    chuafangbuy() {
-      window.location.href = this.chufang.goodUrl;
-    },
-
-    //  changeName(newName){
-    //             this.name = newName;
-    //         },
-
-    userclose() {
-      this.userlist = [];
-      this.dialogInfo1 = false;
-    },
-    async userquery() {
-      let data = await goodsmessage(this.productCode);
-      if (data) {
-        console.log(data);
-        debugger;
-        this.newlist = data.data;
-      }
-      this.productAttachmentList = this.newlist[0].productAttachmentList;
-      this.userlistmenu = this.newlist[0].productAttachmentList;
-      let changemess = JSON.stringify(this.userlistmenu);
-      this.changemessage({ data: changemess });
-      this.parent_msg = this.userlistmenu;
-    },
-    async rxquery() {
-      let data = await oncequery(this.productCode);
-      let outputObj = {};
-      if (data) {
-        console.log(data);
-        debugger;
-        outputObj = data;
-        outputObj.productName = data.name;
-        outputObj.picture =
-          "https://royalcanincn.escase.cn/jc/royalcanin/" + outputObj.picture;
-        outputObj.showImgFile =
-          "https://royalcanincn.escase.cn/jc/royalcanin/" +
-          outputObj.showImgFile;
-        this.newlist = [outputObj];
-      }
-      let picture = this.newlist[0].picture.split(",");
-      this.productAttachmentList = picture;
-    },
-
-    //获取用户领取的优惠券
-    async userdraw(mobile) {
-      let data = await getdraw(mobile);
-      if (data) {
-        this.drawlist = data.data;
-      }
-    },
-
-    //获取所有的优惠券
-    async alldrawlist(memberId) {
-      let data = await alldiscount(memberId);
-      let userlist = [];
-      let menulsit = [];
-      if (data) {
-        this.alldraw = data;
-        // console.log(this.alldraw.data);
-        let alllist = [];
-        this.userlist = this.alldraw.data;
-        this.userlist.forEach((element, index) => {
-          if (
-            typeof element.productCodes == "string" ||
-            !element.productCodes
-          ) {
-            userlist.push(element);
-            //  let s=element.productCodes.split(',');
-            //     console.log(s.indexOf(this.productCode) != -1 )
-            //  console.log('这是字符串')
-          }
-        });
-        let menualist = [];
-        userlist.filter((item) => {
-          let valDateFromTime = 0;
-          let valDateToTime = 0;
-          let curTime = new Date().getTime();
-          let dateChecked = true;
-          if (item.fValidFrom) {
-            valDateFromTime = new Date(item.fValidFrom).getTime();
-          }
-          if (item.fValidTo) {
-            valDateToTime = new Date(item.fValidTo).getTime();
-          }
-          if (valDateFromTime && curTime < valDateFromTime) {
-            dateChecked = false;
-          }
-          if (valDateToTime && curTime > valDateToTime) {
-            dateChecked = false;
-          }
-          if (dateChecked && item.activityId != 10) {
-            if (!item.productCodes) {
-              menualist.push(item);
-            } else {
-              item.productCodes = item.productCodes.split(",");
-              item.productCodes.forEach((element) => {
-                if (element == this.curItem.productCode) {
-                  menualist.push(item);
-                }
-              });
-            }
-          } else {
-            //Expired coupons
-          }
-        });
-        this.usernewlist = menualist;
-      }
-    },
-
-    plus(num, index) {
-      if (this.sales_num >= this.curItem.leftAllotment) {
-        this.$message({
-          type: "warning",
-          message: "已达到本品最大购买上限",
-        });
-      } else {
-        this.sales_num = parseInt(this.sales_num) + 1;
-      }
-    },
-    // 数量减方法
-    sub(num, index) {
-      if (this.sales_num <= 1) {
-        this.sales_num = 1;
-      } else {
-        this.sales_num = parseInt(this.sales_num) - 1;
-      }
-    },
-
-    async courseId(item) {
-      // let userid=JSON.parse(location.getItem('userInfo'));
-      // let mobile=JSON.parse(location.getItem('userInfo'));
-      // console.log(userid,mobile);
-      let basePoint = item.basePoint;
-      basePoint = basePoint ? basePoint : 0;
-      let data = await postCourseId(
-        item.productCode,
-        this.sales_num,
-        this.usermessage.data.id,
-        this.usermessage.data.mobile,
-        item.picFile,
-        item.productName,
-        item.ecPrice,
-        item.specifications,
-        item.leftAllotment,
-        basePoint
-      );
-      if (data) {
-        this.productlist = data;
-      }
-    },
-    usertanchu(item, orderm) {
-      let user = this.$store.state.userInfo;
-      if (!user) {
-        this.dialogInfo2 = true;
-        return;
-      } else {
-        this.courseId(item);
-        if (orderm == 0) {
-          this.$message({
-            type: "warning",
-            message: "加入购物车成功",
-          });
-        }
-        if (orderm == 1) {
-          let list = [
-            {
-              id: item.id,
-              productCode: item.productCode,
-              productPrice: item.ecPrice,
-              productName: item.productName,
-              productImg: item.picFile,
-              specifications: item.specifications,
-              leftAllotment: item.leftAllotment,
-              basePoint: item.basePoint,
-              buyCount: this.sales_num,
-              memberId: "",
-              mobile: "",
-              checked: true,
-            },
-          ];
-
-          this.$router.push({
-            path: "/personal/settlement",
-            query: {
-              list: JSON.stringify(list),
-            },
-          });
-        }
-      }
-    },
-    userget() {
-      let user = localStorage.getItem("userInfo");
-      if (user == undefined || user == null || user == "") {
-        this.dialogInfo2 = true;
-        return;
-      } else {
-        //this.userdraw(this.usermessage.data.mobile);
-        this.alldrawlist(this.usermessage.data.id);
-        this.dialogInfo1 = true;
-      }
-    },
-    selectsearch(item, index) {
-      if (!item.leftAllotment || item.leftAllotment <= 0) return;
-      this.activeIndexa = index;
-      this.curItem = item;
-      this.productAttachmentList = item.productAttachmentList;
-      this.crumbs.pop();
-      this.crumbs.push({ title: item.productName });
-    },
-  },
-
-  onceproduct() {},
-};
-</script>
-
-<style lang="less" scoped>
-@import url("../../assets/css/producted.less");
+<template>
+  <div>
+    <div class="user">
+      <Myheader></Myheader>
+      <div class="rc-top"></div>
+      <tabs :crumbs="crumbs"></tabs>
+      <div class="online rc-margin--none" id="fixed-catbar-seperator"></div>
+      <div class="rc-top"></div>
+      <div
+        class="
+          rc-usermain
+          ts-product-detail
+          rc-max-width--xl
+          rc-layout-container rc-two-column rc-border-bottom
+          rc-border-colour--brand4
+        "
+      >
+        <div class="rc-column">
+          <div data-js-carousel="" data-image-gallery="true">
+            <div
+              class="rc-carousel rc-carousel__gallery-image"
+              data-zoom-container="328b2e5f-6904-4cac-9709-51ed18d2500f"
+              data-zoom-factor="2"
+            >
+              <!-- Big images-->
+              <div v-for="(item, index) in productAttachmentList" :key="index">
+                <div>
+                  <img v-if="(item.attachmentPath.indexOf('mp4')<0)" :src="item.attachmentPath" />
+				  <video v-if="(item.attachmentPath.indexOf('mp4')>0)" preload="meta" controls="controls">
+					<source :src= item.attachmentPath type="video/mp4">
+				  </video>
+                </div>
+              </div>
+
+              <!-- <div>
+			  <div>
+				  <img src="https://cdn.royalcanin-weshare-online.io/m2kia2QBG95Xk-RBC8jn/v1/medium-maxi-giant-pos-2012-packshots-ma-ad-shn-packshot?w=420&fm=jpg&auto=compress" alt="Product alt text" />
+			  </div>
+			</div> -->
+              <!-- Big images end-->
+            </div>
+            <div class="rc-carousel__gallery-thumbnails-wrapper">
+              <div class="rc-carousel rc-carousel__gallery-thumbnails">
+                <!-- Thunb images-->
+                <div
+                  class="
+                    rc-carousel__gallery-thumbnail
+                    tns-item tns-slide-active
+                  "
+                  v-for="(item, index) in productAttachmentList"
+                  :key="index"
+                >
+                  <div class="rc-img--square">
+                    <img :src="item.attachmentPath" v-if="(item.attachmentPath.indexOf('mp4')<0)" />
+					<img src="/images/default.jpg" class="ts-video-btn" v-if="(item.attachmentPath.indexOf('mp4')>0)" />
+                  </div>
+                </div>
+                <!-- <div class="rc-carousel__gallery-thumbnail">
+                  <figure
+                    class="rc-img--square"
+                    style="
+                      background-image: url('https://cdn.royalcanin-weshare-online.io/m2kia2QBG95Xk-RBC8jn/v1/medium-maxi-giant-pos-2012-packshots-ma-ad-shn-packshot?w=64&fm=jpg&auto=compress');
+                    "
+                  >
+                    <figcaption class="rc-screen-reader-text">
+                      Product caption text
+                    </figcaption>
+                  </figure>
+                </div>
+                <div class="rc-carousel__gallery-thumbnail">
+                  <figure
+                    class="rc-img--square"
+                    style="
+                      background-image: url('https://cdn.royalcanin-weshare-online.io/UCEUa2QBaxEApS7L_-Xz/v2/fbn-2013-graphiccodes-packshots-siam-ad-int-fbn-packshot?w=64&fm=jpg&auto=compress');
+                    "
+                  >
+                    <figcaption class="rc-screen-reader-text">
+                      Product caption text
+                    </figcaption>
+                  </figure>
+                </div> -->
+                <!-- Thunb images end-->
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div
+          class="ts-product-header rc-column"
+          id="328b2e5f-6904-4cac-9709-51ed18d2500f"
+        >
+          <div class="usermain">
+            <div class="online bold rc-md-down"></div>
+            <div class="rc-main">
+              <div class="rc-title">
+                <h2>{{ curItem.brandName + " " + curItem.productName }}</h2>
+              </div>
+            </div>
+            <div class="online rc-md-down"></div>
+            <div class="rc-main">
+              <div class="productdetails">
+				  <div class="rc-productdetail" v-if="!userbuy">
+				    <i class="ts-row-title">适用年龄：</i>
+				    <span>{{ curItem.tagUsedAge }}</span>
+				  </div>
+				  <div class="rc-productdetail" v-if="!userbuy">
+				    <i class="ts-row-title">所属分类：</i>
+				    <span>{{ curItem.categoryName }}</span>
+              
+				  </div>
+				<div class="rc-button" v-if="!userbuy && curItem.goodUrl && curItem.goodUrl.length>5">
+					<a :href="curItem.goodUrl" target='_blank' class="ts-standard-btn">立即购买</a>
+				</div>
+         
+          
+                <div class="rc-productdetail" v-if="userbuy">
+					<i class="ts-row-title">商品价格：</i>
+					<span class="ts-realprice">￥{{ curItem.ecPrice }}</span>
+					<s class="ts-ecprice" v-if="curItem.ecPrice<curItem.rsp"
+						>￥{{ curItem.rsp }}
+					</s>
+					<span class="ts-record" v-if="curItem.basePoint!==0">
+						购买该商品你将获得<span class="rc-zeta">{{curItem.basePoint}}积分</span>
+					</span>
+                  
+                  <!-- <span class="rc-title">购买该商品你将得到22积分</span> -->
+                </div>
+                <div class="rc-productdetai" v-if="userbuy">
+                  <div>
+                    <i class="ts-row-title">活动促销：</i>
+                    <span>全场商品限时优惠</span>
+                  </div>
+                  <em class="ts-right-arr" @click="userget()">立即领取</em>
+                </div>
+              </div>
+            </div>
+            <div class="online bold rc-md-down"></div>
+            <div class="rc-main rc-md-up" v-if="userbuy">
+              <div class="online"></div>
+            </div>
+
+            <div class="rc-productdeta" v-if="userbuy">
+              <div class="rc-main">
+                <div class="rc-prodtop">
+                  <div>
+                    <i class="ts-row-title">商品规格：</i>
+                  </div>
+					<div class="ts-tag-list">
+						<em v-for="(item, index) in newlist" :key="index"  @click="selectsearch(item, index)" :class="[(activeIndexa==index && item.leftAllotment>0)?'active':'unactive',item.leftAllotment>0?'':'disabled']">
+							{{ item.specifications }}
+						</em>
+					</div>
+				<!-- 一个标品有多个商品, 每个商品有不同的价格
+				<em class="active">
+					{{ item.specifications }}
+				</em>
+				-->
+                </div>
+              </div>
+              <div class="rc-main">
+                <div class="rc-produnnum" v-if="(userbuy && curItem.leftAllotment>0)">
+                  <div><i class="ts-row-title">商品数量：</i></div>
+                  <img
+                    src="../../assets/image/userjian.png"
+                    alt=""
+                    @click="sub()"
+                  />
+                  <strong>{{ sales_num }}</strong>
+                  <img
+                    src="../../assets/image/userjia.png"
+                    alt=""
+                    @click="plus()"
+                  />
+                </div>
+              </div>
+              <div class="rc-main rc-md-up" v-if="userbuy">
+                <div class="online"></div>
+              </div>
+              <div class="online rc-md-down"></div>
+              <div class="rc-main">
+                <div class="certification">
+                  <ul>
+                    <li>
+                      <span
+                        ><i class="ts-row-title">服务说明：</i
+                        ><i
+                          >当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解)</i
+                        ></span
+                      >
+                    </li>
+                    <li>
+                      <span
+                        ><i class="ts-row-title">商品运费：</i
+                        ><i>全场包邮(港澳除外)</i></span
+                      >
+                    </li>
+
+                    <li>
+                      <span
+                        ><i class="ts-row-title">商品编号：</i
+                        ><i>{{ curItem.productCode }}</i></span
+                      >
+                    </li>
+                  </ul>
+                </div>
+                <div class="rc-button"  v-if="(userbuy && curItem.leftAllotment>0)">
+                  <span @click="usertanchu(curItem, 0)">加入购物车</span>
+                  <span @click="usertanchu(curItem, 1)">立即购买</span>
+                </div>
+                 
+              </div>
+              <div class="online bold rc-md-down"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="rc-footimage rc-padding--sm rc-max-width--lg">
+        <img :src="curItem.showImgFile" alt="" />
+      </div>
+      <FixRight></FixRight>
+      <Myfooter v-on:litentop="showmesg"></Myfooter>
+  
+    </div>
+    <el-dialog :visible.sync="dialogInfo1" @close="userclose" class="pop_coupon" :close-on-click-modal="false">
+		<div class="ts-no-data" v-if="usernewlist.length<=0">目前还没有可用的优惠券</div>
+      <div class="rs-dis">
+        <div
+          class="rc-discount"
+          v-for="(item, index) in usernewlist"
+          :key="index"
+        >
+          <img :src="userimage" alt="" />
+		  <div class="rc-contair">
+		    <div class="rc-left">
+		  	<div>
+		  		<i v-if="(item.couponTypeId!='4' && item.couponAmount>0)">
+		  			￥
+		  		</i>
+		  		<span>
+		  			{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
+		  		</span>
+		  	</div>
+		  	<strong>{{ item.couponName }}</strong>
+		    </div>
+		    <div class="rc-right">
+		  	<i>
+		  	  {{ item.couponName }}
+		  	</i>
+		  	<div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
+		  		<strong>有效期</strong>
+		  	  <span>{{item.validFrom}}至</span>
+		  	  <em>{{item.validTo}}</em>
+		  	</div>
+		  	<div class="rc-footer">
+		  	  <span @click="usergetconf(item)">立即领取</span>
+		  	</div>
+		    </div>
+		  </div>
+        </div>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogInfo2" @close="userclose" :close-on-click-modal="false">
+      <div class="rc-headera">
+        <div class="rc-title">
+          <img src="../../assets/error.png" alt="" />
+        </div>
+        <div class="rc-logmain">
+          <h3>温馨提示</h3>
+          <span>请先点击下方进行登录/注册</span>
+        </div>
+        <nuxt-link :to="`/userlogin/login/`">
+          <div class="userer">
+            <span>立即登录</span>
+          </div>
+        </nuxt-link>
+      </div>
+    </el-dialog>
+    <div class="rc-button rc-md-down" v-if="(userbuy && curItem.leftAllotment>0)">
+      <span @click="usertanchu(curItem, 0)">加入购物车</span>
+      <span @click="usertanchu(curItem, 1)">立即购买</span>
+    </div>
+	<div class="rc-button rc-md-down " v-if="!userbuy && curItem.goodUrl && curItem.goodUrl.length>5">
+		<a :href="curItem.goodUrl" target='_blank' class="ts-standard-btn">立即购买</a>
+	</div>
+    
+  </div>
+</template>
+
+<script>
+import Myheader from "~/components/header.vue";
+import tabs from "@/components/tabs.vue";
+import FixRight from "~/components/fixed-right.vue";
+import unlogin from "~/components/unlogin.vue";
+import Myfooter from "~/components/rc-footer.vue";
+import { mapMutations } from "vuex";
+const settings = require("@/config");
+import {
+  goodsmessage,
+  getConfig,
+  postCourseId,
+  getdraw,
+  alldiscount,
+  oncequery,
+  biaomessage
+} from "../../ajax/getData";
+
+export default {
+	async asyncData (context) {
+		let isRxGoods = context.route.query.isRxGoods;
+		let userbuy = true;
+		let newlist = [];
+		let curItem = {};
+		let videolist=[];
+		let productAttachmentList = [];
+		let userlistmenu = [];
+		isRxGoods = (isRxGoods == '1'?true:false);
+		let mainProductCode = context.route.query.mainProductCode;
+		let productCode = context.route.query.productCode;
+		let activeIndexa = 0;
+		if(!productCode || productCode.length<=0)
+			throw new Error('Empty product code');
+		productCode = productCode.split(",");
+		if(isRxGoods){
+			let data = await oncequery(mainProductCode);
+			let outputObj = {};
+			if (data) {
+				outputObj = data;
+				outputObj.productName = data.name;
+				newlist = [outputObj];
+				curItem = outputObj;
+			}
+			let insertTmpObj = {id:1, attachmentType:1, sort:1, attachmentPath:newlist[0].picture};
+			productAttachmentList = [insertTmpObj];
+			userbuy = false;
+		} else {
+			let stopLeftAllotmentChecking = false;
+			let stopIndex = 0;
+			for(let singleCode of productCode) {
+				let data = await goodsmessage(singleCode);
+				if (data && data.data.length>0) {
+					newlist.push(data.data[0]);
+
+					if(data.data[0].leftAllotment>0 && !stopLeftAllotmentChecking) {
+						activeIndexa = stopIndex;
+						curItem = data.data[0];
+						stopLeftAllotmentChecking=true;
+					}
+					stopIndex++;
+				}
+			}
+			if(curItem.productAttachmentList != undefined)
+				productAttachmentList = curItem.productAttachmentList;
+			let list=[];
+			if(curItem.productName == undefined)
+				curItem = newlist[0];
+			userbuy = true;
+		}
+		if(!curItem || curItem.productName == undefined)
+			throw new Error("商品信息错误");
+		let crumbs = [
+			{
+				path:'/productdetails/productlist/',
+			},
+			{
+				title: curItem.productName,
+			}
+		];
+		return {
+			crumbs,
+			activeIndexa,
+			curItem,
+			newlist,
+			videolist,
+			productAttachmentList,
+			userbuy,
+			isRxGoods
+		}
+	},
+   data() {
+    return {
+      tableLabelTest: [],
+      userimage: require("../../assets/image/unused.png"),
+      gotop: false,
+      dialogInfo1: false,
+      videolist:[],
+      videoimg:'',
+      name: [],
+      userlist: [],
+      drawlist: [], //用户可以领取的优惠券
+      alldraw: [],
+      userlistmenu: [],
+      msg: [""],
+      parent_msg: [""],
+      usermessage: [],
+      dialogInfo2: false,
+      productCode: "", //商品code
+      productlist: [],
+      userbuy: true,
+      sales_num: 1,
+
+      productAttachmentList: [],
+      usernewlist: [
+        {
+          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"),
+        },
+      ],
+
+      newlist: [
+        {
+          price: "167.00",
+          pricestype: "英国短毛猫成猫全价湿粮",
+          special: "限时折扣全场商品8折",
+          period: "今晚20:00前付款，明日12:00前发货",
+          starttime: "商品未满199元  快递费:9.00元",
+          shangbianhao: "6212263798102432",
+          catimage: require("../../assets/image/rc-new.png"),
+        },
+      ],
+      stype: [
+        {
+          title: "3kg",
+        },
+        {
+          title: "5kg",
+        },
+      ],
+    };
+  },
+
+  components: {
+    Myheader,
+    tabs,
+    unlogin,
+    Myfooter,
+	FixRight
+  },
+  //  middleware: 'metaTitle',
+  //   // middleware: 'metaTitle',
+  // meta: {title: '产品详情'},
+ 
+  mounted() {
+	this.checkIsLogin();
+  // console.log(this.curItem);
+    if (this.usermessage !== "" || this.usermessage.data !== undefined) {
+		this.usermessage = this.$store.state.userInfo;
+		this.productCode = this.$route.query.productCode;
+		_hmt.push([
+		    "_trackCustomEvent",
+		    "product_visit",
+		    {
+				"product_id":this.curItem.productCode,
+				"product_category":this.curItem.categoryName,
+		        "product_name": this.curItem.productName,
+		    }
+		])
+    }
+  },
+  methods: {
+    ...mapMutations(["changemessage","checkIsLogin"]),
+    showmesg() {
+      this.toTop();
+    },
+    //领取优惠券
+    usergetconf(item) {
+		_hmt.push([
+		    "_trackCustomEvent",
+		    "get_coupon",
+		    {
+				"product_id":this.curItem.productCode,
+				"product_category":this.curItem.categoryName,
+				"product_name": this.curItem.productName,
+				"product_quantity" : this.sales_num,
+				"product_amount" : this.sales_num*this.curItem.ecPrice,
+		    }
+		])
+		if (this.usermessage.data !== "" || this.usermessage.data !== undefined) {
+			this.getconf(this.usermessage.data.id, item.couponId);
+		}
+    },
+
+    //获取用户领取的优惠券
+    async getconf(memberId, couponId) {
+      let data = await getConfig(memberId, couponId);
+	  let msg = '领取成功';
+	  let msgType = 'success';
+      if (data) {
+		if(data.code!='0') {
+			msgType = 'warning';
+			msg = data.msg;
+		}
+		this.$message({
+			type: msgType,
+			message: msg,
+		});
+      }
+    },
+    userclose() {
+      this.userlist = [];
+	  this.dialogInfo1=false;
+    },
+    async userquery() {
+      let data = await goodsmessage(this.productCode);
+      if (data) {
+          console.log(data)
+          debugger
+        this.newlist = data.data;
+      }
+      this.productAttachmentList = this.newlist[0].productAttachmentList;
+      this.userlistmenu = this.newlist[0].productAttachmentList;
+      let changemess = JSON.stringify(this.userlistmenu);
+      this.changemessage({ data: changemess });
+      this.parent_msg = this.userlistmenu;
+    },
+	async rxquery() {
+	  let data = await oncequery(this.productCode);
+	  let outputObj = {};
+	  if (data) {
+		outputObj = data;
+		outputObj.productName = data.name;
+	    this.newlist = [outputObj];
+	  }
+	  let picture = this.newlist[0].picture.split(",");
+	  this.productAttachmentList = picture;
+	},
+
+    //获取用户领取的优惠券
+    async userdraw(mobile) {
+      let data = await getdraw(mobile);
+      if (data) {
+        this.drawlist = data.data;
+      }
+    },
+
+    //获取所有的优惠券
+    async alldrawlist(memberId) {
+      let data = await alldiscount(memberId);
+      let userlist = [];
+      let menulsit = [];
+      if (data) {
+        this.alldraw = data;
+        // console.log(this.alldraw.data);
+        let alllist = [];
+        this.userlist = this.alldraw.data;
+        this.userlist.forEach((element, index) => {
+          if (typeof element.productCodes == "string" || !element.productCodes) {
+            userlist.push(element);
+            //  let s=element.productCodes.split(',');
+            //     console.log(s.indexOf(this.productCode) != -1 )
+            //  console.log('这是字符串')
+          }
+        });
+        let menualist = [];
+        userlist.filter((item) => {
+			let valDateFromTime=0;
+			let valDateToTime=0;
+			let curTime = new Date().getTime();
+			let dateChecked=true;
+			if(item.fValidFrom) {
+				valDateFromTime = new Date(item.fValidFrom).getTime();
+			}
+			if(item.fValidTo) {
+				valDateToTime = new Date(item.fValidTo).getTime();
+			}
+			if(valDateFromTime && curTime < valDateFromTime) {
+				dateChecked=false;
+			}
+			if(valDateToTime && curTime > valDateToTime) {
+				dateChecked=false;
+			}
+			if(dateChecked && item.activityId!=10) {
+				if(!item.productCodes) {
+					menualist.push(item);
+				} else {
+					item.productCodes = item.productCodes.split(",");
+					item.productCodes.forEach((element) => {
+						if (element == this.curItem.productCode) {
+							menualist.push(item);
+						}
+					});
+				}
+			} else {
+				//Expired coupons
+			}
+        });
+        this.usernewlist = menualist;
+      }
+    },
+
+    plus(num, index) {
+		if(this.sales_num >= this.curItem.leftAllotment) {
+			this.$message({
+				type: "warning",
+				message: '已达到本品最大购买上限',
+			});
+		} else {
+			this.sales_num = parseInt(this.sales_num) + 1;
+		}
+    },
+    // 数量减方法
+    sub(num, index) {
+      if (this.sales_num <= 1) {
+        this.sales_num = 1;
+      } else {
+        this.sales_num = parseInt(this.sales_num) - 1;
+      }
+    },
+
+    async courseId(item) {
+      // let userid=JSON.parse(location.getItem('userInfo'));
+      // let mobile=JSON.parse(location.getItem('userInfo'));
+      // console.log(userid,mobile);
+	  let basePoint = item.basePoint;
+	  basePoint = basePoint?basePoint:0;
+      let data = await postCourseId(
+        item.productCode,
+        this.sales_num,
+        this.usermessage.data.id,
+        this.usermessage.data.mobile,
+        item.picFile,
+        item.productName,
+        item.ecPrice,
+        item.specifications,
+        item.leftAllotment,
+		basePoint
+      );
+      if (data) {
+        this.productlist = data;
+      }
+    },
+    usertanchu(item, orderm) {
+      let user = this.$store.state.userInfo;
+      if (!user) {
+        this.dialogInfo2 = true;
+        return;
+      } else {
+        this.courseId(item);
+        if (orderm == 0) {
+          this.$message({
+            type: "warning",
+            message: "加入购物车成功",
+          });
+		  _hmt.push([
+		      "_trackCustomEvent",
+		      "add_to_cart",
+		      {
+		  		"product_id":this.curItem.productCode,
+		  		"product_category":this.curItem.categoryName,
+		        "product_name": this.curItem.productName,
+				"product_quantity" : this.sales_num,
+				"product_amount" : this.sales_num*this.curItem.ecPrice,
+		      }
+		  ])
+        }
+        if (orderm == 1) {
+          let list = [
+            {
+              id: item.id,
+              productCode: item.productCode,
+              productPrice: item.ecPrice,
+              productName: item.productName,
+              productImg: item.picFile,
+              specifications: item.specifications,
+			  leftAllotment: item.leftAllotment,
+			  basePoint: item.basePoint,
+              buyCount: this.sales_num,
+              memberId: "",
+              mobile: "",
+              checked: true,
+            },
+          ];
+		  _hmt.push([
+		      "_trackCustomEvent",
+		      "add_to_cart",
+		      {
+		  		"product_id":this.curItem.productCode,
+		  		"product_category":this.curItem.categoryName,
+		        "product_name": this.curItem.productName,
+		  		"product_quantity" : this.sales_num,
+		  		"product_amount" : this.sales_num*this.curItem.ecPrice,
+		      }
+		  ])
+
+          this.$router.push({
+            path: "/personal/settlement",
+            query: {
+              list: JSON.stringify(list),
+            },
+          });
+        }
+      }
+    },
+    userget() {
+      let user = localStorage.getItem("userInfo");
+      if (user == undefined || user == null || user == "") {
+        this.dialogInfo2 = true;
+        return;
+      } else {
+        //this.userdraw(this.usermessage.data.mobile);
+        this.alldrawlist(this.usermessage.data.id);
+        this.dialogInfo1 = true;
+      }
+    },
+    selectsearch(item, index) {
+		if(!item.leftAllotment || item.leftAllotment<=0)
+			return;
+      this.activeIndexa = index;
+	  this.curItem = item;
+	  this.productAttachmentList = item.productAttachmentList;
+	  this.crumbs.pop();
+	  this.crumbs.push({title: item.productName});
+    },
+  },
+
+  onceproduct() {},
+};
+</script>
+
+<style lang="less" scoped>
+@import url("../../assets/css/producted.less");
 </style>
\ No newline at end of file
diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue
index d11951f8..4dde4374 100644
--- a/rc-busness/pages/productdetails/productlist.vue
+++ b/rc-busness/pages/productdetails/productlist.vue
@@ -39,8 +39,8 @@
               </li>
             </ol>
           </div>
-          <div class="online rc-md-up"></div>
-          <div class="ts-scrollable-container">
+          <div class="online rc-md-up" v-if="!inRxGoods"></div>
+          <div class="ts-scrollable-container" v-if="!inRxGoods">
             <h2>年龄:</h2>
             <ol class="ts-scrollable">
               <li
@@ -54,8 +54,8 @@
               </li>
             </ol>
           </div>
-          <div class="online rc-md-up"></div>
-          <div class="ts-scrollable-container">
+          <div class="online rc-md-up" v-if="!inRxGoods"></div>
+          <div class="ts-scrollable-container" v-if="!inRxGoods">
             <h2>功能:</h2>
             <ol class="ts-scrollable">
               <li
@@ -69,8 +69,8 @@
               </li>
             </ol>
           </div>
-          <div class="online rc-md-up"></div>
-          <div class="ts-scrollable-container">
+          <div class="online rc-md-up" v-if="!inRxGoods"></div>
+          <div class="ts-scrollable-container" v-if="!inRxGoods">
             <h2>品种:</h2>
             <ol class="ts-scrollable">
               <li
@@ -84,6 +84,20 @@
               </li>
             </ol>
           </div>
+		  <div class="online rc-md-up" v-if="inRxGoods"></div>
+		  <div class="ts-scrollable-container" v-if="inRxGoods">
+		    <h2>功能:</h2>
+		    <ol class="ts-scrollable">
+		      <li
+		        v-for="(item, index) in rxFilters"
+		        :key="index"
+		        @click="selectFilter(item, index)"
+		        :class="item.checked ? 'active' : 'unactive'"
+		      >
+		        {{ item.tagName }}
+		      </li>
+		    </ol>
+		  </div>
           <div class="online rc-md-up"></div>
         </div>
       </div>
@@ -313,12 +327,14 @@ import Myheader from "~/components/header.vue";
 import MyFooter from '~/components/rc-footer.vue'
 import FixRight from "~/components/fixed-right.vue";
 import tabs from "~/components/tabs.vue";
+import envData from "~/config/env-data.js";
 import {
   userstype,
   biaome,
   biaomessage,
   searchchanpin,
-  userquery
+  userquery,
+  userque
 } from "../../ajax/getData";
 export default {
   data() {
@@ -328,6 +344,8 @@ export default {
 				path:'/productdetails/productlist/',
 			}
 		],
+		envData,
+		rxFilters:[],
 		value: "",
 		isLoading: false,
 		userstype: [],
@@ -507,13 +525,10 @@ export default {
 		_self.chooseDefaultOptions();
 		//_self.usetmessage();
 	});
-	/*
-	if (stype !== "" && stype !== undefined) {
-		this.onmessage(stype);//Wont happen
-	} else {
-		this.usetmessage();
-	}
-	*/
+	//Handling RxGoods filter
+	let curEnv = process.env.NODE_ENV;
+	this.rxFilters = envData[curEnv].rxGoodsFilter;
+	//Handling RxGoods filter end
   },
   methods: {
     async usersearch(stype, usertype) {
@@ -598,7 +613,7 @@ export default {
 
     async usetmessage() {
       this.isLoading = true;
-      let data = await biaome(this.activeIndex1, "", 1, 10);
+      let data = await biaome(this.activeIndex1, "", 1, 20);
       if (data) {
         this.rccontair = data;
         this.isLoading = false;
@@ -606,12 +621,21 @@ export default {
     },
     async onmessage(stype) {
       this.isLoading = true;
-      let data = await biaomessage(stype, "", 1, 10);
+      let data = await biaomessage(stype, "", 1, 20);
       if (data) {
         this.rccontair = data;
         this.isLoading = false;
       }
     },
+	async getRxGoodsByFunc(functionName) {
+	  this.isLoading = true;
+	  let petType = this.activeIndex1;
+	  let data = await userque(functionName, petType, 1, 20);
+	  if (data) {
+	    this.rccontair = data;
+	    this.isLoading = false;
+	  }
+	},
 	chooseDefaultOptions(){
 		let tagStatus = this.routeParams.tagStatus;
 		let categoryName = this.routeParams.categoryName;
@@ -713,8 +737,24 @@ export default {
 		else {
 			this.prefecture[this.rxGoodsIndexPointer].checked=false;
 			this.inRxGoods=false;
+			for(let tmp of this.rxFilters) {
+				tmp.checked = false;
+			}
 		}
 	},
+	selectFilter(item) {
+		for(let tmp of this.rxFilters) {
+			if(item.tagValue == tmp.tagValue) {
+				item.checked = !item.checked;
+			} else {
+				tmp.checked = false;
+			}
+		}
+		if(item.checked)
+			this.getRxGoodsByFunc(item.tagValue);
+		else
+			this.getRxGoodsByFunc();
+	},
 	resetAllOptions(){
 		let _self = this;
 		let categoriesSelectionEles=this.prefecture;
@@ -725,6 +765,7 @@ export default {
 		allSelectionEles.forEach(function(tmp,index){
 			tmp.checked=false;
 		});
+		this.checkRxGoods(false);
 		this.userserachlist = [
 			{
 				categoryName: [], //专区
diff --git a/rc-busness/pages/resentation/resentation.vue b/rc-busness/pages/resentation/resentation.vue
index 9c77133f..2d3182b8 100644
--- a/rc-busness/pages/resentation/resentation.vue
+++ b/rc-busness/pages/resentation/resentation.vue
@@ -1,44 +1,54 @@
 <template>
-  <div>
+  <div class="rc-padding-y--lg">
     <Myheader></Myheader>
     <div class="rc-top"></div>
     <div class="ts-banner-swiper-container">
-      <img src="/images/userbanner.png" alt="" class="user-pc" />
-      <img src="/images/rc-phone.png" alt="" class="user-phone" />
-    </div>
-    <div class="all-contair">
-      <div class="all-contair dog-foot">
-        <h2>明星犬粮</h2>
-        <img src="/images/dogfoot.png" alt="" />
-        <strong>中型幼犬离乳期全家奶糕</strong>
-        <p>
-          中心犬离乳期专属<br />高易再水合颗粒<br />
-          帮助增强保护健康成长
-        </p>
-        <em
-          class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center"
-          @click="userselect(1)"
-        >
-          点击查看
-        </em>
-      </div>
-      <div class="all-contair cat-foot">
-        <h2>明星猫粮</h2>
-        <img src="/images/catfoot.png" alt="" />
-        <strong>皇家离乳期幼猫全家奶糕</strong>
-        <p>
-          幼猫成长专属<br />
-          支持幼猫自身保护力<br />
-          为快速生长提供足够能量
-        </p>
-        <em
-          class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center"
-          @click="userselect(2)"
-        >
-          点击查看
-        </em>
-      </div>
+		<picture>
+		  <source
+		    media="(max-width: 768px)"
+		    srcset="/images/rc-phone.png"
+		  />
+		  <source
+		    media="(min-width: 769px)"
+		    srcset="/images/userbanner.png"
+		  />
+		  <img src="/images/banner/pc-weixin.png" />
+		</picture>
     </div>
+	<div>
+		<ul class="ts-product-list rc-margin-bottom--lg">
+		  <li
+		    v-for="(item, index) in dataList.amature"
+		    :key="index"
+		    class="rc-margin-top--md"
+		  >
+			<h2 class="rc-beta rc-margin-y--md">{{ index==1?'明星猫粮':'明星犬粮' }}</h2>
+		    <div
+		      class="rc-click rc-margin-bottom--md"
+		      @click="selectproduce(item, index)"
+		    >
+		      <div class="rc-rccontair">
+		        <img :src="item.productimage" alt="" />
+		      </div>
+		    </div>
+		    <div class="rc-column">
+		      <div class="rc-click" @click="selectproduce(item, index)">
+		        <span>{{ item.title }}</span>
+				<div class="desc">{{ item.detail }}</div>
+		      </div>
+		      <strong
+		        class="
+		          ts-standard-btn ts-standard-btn--two
+		          rc-margin-y--md
+		          center
+		        "
+		        @click="selectproduce(item, index)"
+		        >立即购买</strong
+		      >
+		    </div>
+		  </li>
+		</ul>
+	</div>
     <div class="contair">
       <nuxt-link :to="`/productdetails/productlist/`">
         <span class="ts-standard-btn center">查看更多</span>
@@ -49,219 +59,72 @@
 
 <script>
 import Myheader from "~/components/header.vue";
+import envData from "~/config/env-data.js";
 export default {
   data() {
-    return {};
+    return {
+		envData,
+		dataList:{amature:[]}
+	};
   },
   components: {
     Myheader,
   },
+  mounted(){
+	  let env=process.env.NODE_ENV;
+	  this.dataList=this.envData[env];
+  },
   methods:{
-      userselect(item){
-          let productCode=88451
-         if(item==1){
-             
-                  this.$router.push({
-        path: "/productdetails/producted",
-        query: {
-          stype: 1,
-          isRxGoods: false,
-          productCode: '80240008F24',
-        },
-      });
-         }else{
+      selectproduce(item) {
+        let isRxGoods = false;
+        let productCode = [];
+        let mainProductCode = item.productCode;
+        if (!item.ecPrice && !item.price) {
+          isRxGoods = 1;
+          productCode = [item.productCode];
+        } else {
+          for (let i of item.productList) {
+            productCode.push(i.productCode);
+          }
+        }
         this.$router.push({
-        path: "/productdetails/producted",
-        query: {
-          stype: 1,
-          isRxGoods: false,
-          productCode: '80240008F24',
-        },
-      });
-         }
-      }
+          path: "/productdetails/producted",
+          query: {
+            stype: 1,
+            isRxGoods: isRxGoods,
+            mainProductCode: mainProductCode,
+            productCode: productCode.join(","),
+          },
+        });
+      },
   }
 };
 </script>
 
 <style lang="less" scoped >
-@import url("../../assets/css/global.less");
-
-//手机端
-@media screen and (max-width: 768px) {
-  .user-pc {
-    display: none;
-  }
-  .user-phone {
-    display: block;
-    height: 400px;
-  }
-  .contair {
-    display: flex;
-    justify-content: center;
-    padding-bottom: 50px;
-    margin-top: 100px;
-  }
-
-  .ts-banner-swiper-container {
+.ts-banner-swiper-container {
     img {
       width: 100%;
-      height: 500px;
-    }
-  }
-  .all-contair {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    img {
-      width: 260px;
-      height: 185px;
-      display: block;
-    }
-    h2 {
-      color: #e2001a;
-      font-size: 20px;
-      font-weight: bold;
-    }
-    strong {
-      font-size: 16px;
-      color: #e2001a;
-      font-weight: bold;
-    }
-    p {
-      color: #666666;
-      font-size: 20px;
-      margin-top: 13px;
-    }
-    .dog-foot {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      width: 48%;
-      img {
-        width: 260px;
-        height: 185px;
-        display: block;
-      }
-      p {
-        color: #666666;
-        font-size: 16px;
-        margin-top: 15px;
-        text-align: center;
-      }
-    }
-    .cat-foot {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      width: 48%;
-      img {
-        width: 260px;
-        height: 185px;
-        display: block;
-      }
-      p {
-        color: #666666;
-        font-size: 16px;
-        margin-top: 15px;
-        text-align: center;
-      }
-    }
-  }
-}
-
-@media screen and (min-width: 769px) {
-  .user-phone {
-    display: none;
-  }
-  .contair {
-    display: flex;
-    justify-content: center;
-    padding-bottom: 106px;
-    margin-top: 206px;
-    .ts-standard-btn {
-      width: 271px;
-      height: 83px;
-      background: #e2001a;
-      opacity: 1;
-      border-radius: 30px;
-      font-size: 29px;
-      color: #ffffff;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-
-  .ts-banner-swiper-container {
-    img {
-      width: 100%;
-      height: 500px;
-    }
-  }
-  .all-contair {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: 70px;
-    img {
-      width: 371px;
-      height: 525px;
-      display: block;
-    }
-    h2 {
-      color: #e2001a;
-      font-size: 83px;
-    }
-    strong {
-      font-size: 52px;
-      color: #e2001a;
-    }
-    p {
-      color: #666666;
-      font-size: 40px;
-      margin-top: 33px;
-    }
-    .dog-foot {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      width: 48%;
-      img {
-        width: 371px;
-        height: 525px;
-        display: block;
-      }
-     
-    }
-    .cat-foot {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      width: 48%;
-      img {
-        width: 371px;
-        height: 525px;
-        display: block;
-      }
-      p {
-        color: #666666;
-        font-size: 40px;
-        margin-top: 33px;
-        text-align: center;
-      }
-    }
-    .ts-standard-btn {
-      width: 270px;
-      height: 83px;
-      border: 2px solid #e2001a;
-      border-radius: 30px;
-      color: #e2001a;
-      font-size: 29px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+      height: auto;
+	  object-fit: contain;
     }
   }
+.ts-product-list li{
+	border:none;
+	max-width:22.75rem;
+	min-width:22.75rem;
+	width:22.75rem;
+	h2{
+		margin-left:auto;
+		margin-right:auto;
+		font-weight: bold;
+	}
+	.rc-column span {
+		height:auto;
+	}
+	.desc {
+		width:13rem;
+		height:auto;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue
index dd302b96..e1f39cab 100644
--- a/rc-busness/pages/userlogin/login.vue
+++ b/rc-busness/pages/userlogin/login.vue
@@ -144,47 +144,49 @@
 <script>
 import { userLongin,sendMsg,vadatnmsg,userregOrLogin,inserdiscount } from "../../ajax/getData";
 import { mapMutations } from "vuex";
+import envData from "~/config/env-data.js";
 import Myheader from "~/components/header.vue"; //引用头部公共组件
 export default {
-  data() {
-    return {
-      phone: "",
-      layerMSg: "手机格式不对",
-      tel: "",
-      password: "",
-      userdata:{},
-      allcheck:false,
-      activeIndex: 0,
-      tamp:'',
-       radioData: [
-    { value: '全部' ,href:'https://royalcanin.com.cn/privacy' },
-    { value: '部分' ,href:''},
-    { value: '零散' }
-   ],
-      hash:'',
-      text: "",
-      sms: "",
-      buttonmsg: "获取验证码",
-      flag: false,
-      adminCode: "",
-      captchadata:'',
-      zhud: false,
-      loading: false,
-      usertitle: true,
-      ifpassword: false,
-      verification:'',//验证码数据
-      userislogin:[],//登录成功数据
-      checked: false,
-      isRank: false,
-      isRanka: false,
-      usercheckbox:false,
+	data() {
+		return {
+			envData,
+			phone: "",
+			layerMSg: "手机格式不对",
+			tel: "",
+			password: "",
+			userdata:{},
+			allcheck:false,
+			activeIndex: 0,
+			tamp:'',
+			radioData: [
+			{ value: '全部' ,href:'https://royalcanin.com.cn/privacy' },
+			{ value: '部分' ,href:''},
+			{ value: '零散' }
+			],
+			hash:'',
+			text: "",
+			sms: "",
+			buttonmsg: "获取验证码",
+			flag: false,
+			adminCode: "",
+			captchadata:'',
+			zhud: false,
+			loading: false,
+			usertitle: true,
+			ifpassword: false,
+			verification:'',//验证码数据
+			userislogin:[],//登录成功数据
+			checked: false,
+			isRank: false,
+			isRanka: false,
+			usercheckbox:false,
 
-      swiperData: [
-        // { index: 1 ,title:'短信验证码登录'},
-        // { index: 2 ,title:'密码登录'},
-      ]
-    };
-  },
+			swiperData: [
+			// { index: 1 ,title:'短信验证码登录'},
+			// { index: 2 ,title:'密码登录'},
+			]
+		};
+	},
   components: {
     Myheader
   },
@@ -228,7 +230,7 @@ export default {
     //全选
     checkBoxa(e,order){
         let checked=e.target.checked;
-        console.log(e.target.checked);
+        // console.log(e.target.checked);
         // this.isRank=e.target.checked;
         // this.isRanka=e.target.checked;
         if(order==3){
@@ -241,7 +243,7 @@ export default {
         else if(order==1){
           this.isRanka=e.target.checked;
         }
-        console.log(this.isRank,this.isRanka);
+        //console.log(this.isRank,this.isRanka);
         if(this.isRanka==true && this.isRank==true){
           this.allcheck=true;
         }else{
@@ -268,7 +270,7 @@ export default {
       //console.log("-----");
       let data = await sendMsg(this.tel);
       if(data){
-        console.log(data);
+        //console.log(data);
         //this.captchadata=data.msgNum;
         this.tamp=data.tamp;
         this.hash=data.hash;
@@ -276,51 +278,46 @@ export default {
 
     },
 
-    //添加优惠券
-        async serdiscount (mobile,couponId) {
-      let data = await inserdiscount(mobile,couponId);
-      if(data){
-        console.log(data);
-      }
-      //console.log(data);
-    },
+	//添加优惠券
+	async serdiscount (mobile,couponId) {
+		let data = await inserdiscount(mobile,couponId);
+		if(data){
 
-    //发送验证码数据
-    async vadmsg() {
-      //console.log("-----");
-     let data = await vadatnmsg(this.sms,this.hash,this.tamp);
-      if(data){
-        return data;
-      }
-    
-    },
+		}
+		//console.log(data);
+	},
+
+	//发送验证码数据
+	async vadmsg() {
+		//console.log("-----");
+		let data = await vadatnmsg(this.sms,this.hash,this.tamp);
+		if(data){
+			return data;
+		}
+	},
        //登录成功数据
     async userlogin() {
-      //console.log("-----");
       let data= await userregOrLogin(this.tel);
       if(data){
         this.userislogin=data;
-        console.log(this.userislogin);
+        //console.log(this.userislogin);
       }
     },
 
 
     onClickHander(e) {
-      console.log(e);
-    },
-    selectGoods(item, index) {
-      this.activeIndex = index;
-      console.log(index);
-
-      if (this.activeIndex == 0) {
-        this.ifpassword = false;
-      } else {
-        this.ifpassword = true;
-      }
+      //console.log(e);
     },
+	selectGoods(item, index) {
+		this.activeIndex = index;
+		if (this.activeIndex == 0) {
+			this.ifpassword = false;
+		} else {
+			this.ifpassword = true;
+		}
+	},
     //注册账户
     useredd() {
-      //console.log("---注册账户");
       this.usertitle = false;
     },
 
@@ -336,7 +333,7 @@ export default {
     getCode() {
       if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
         this.$message({
-          type: 'warning',
+          type: 'error',
           message: '手机号码输入有误'
         });
         return
@@ -361,85 +358,90 @@ export default {
     async register() {
       if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
         this.$message({
-          type: 'warning',
+          type: 'error',
           message: '手机号码输入有误'
         });
         return
       }
       if(this.sms==''){
         this.$message({
-          type: 'warning',
+          type: 'error',
           message: '请输入验证码'
         });
         return
       }
-          if(this.usercheckbox==false){
+      if(this.usercheckbox==false){
         this.$message({
-          type: 'warning',
+          type: 'error',
           message: '请先勾选相关协议'
         });
         return
       }
       if(this.usercheckbox==false){
-        //console.log('----');
         if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
           this.$message({
-            type: 'warning',
+            type: 'error',
             message: '手机号码输入有误'
           });
             this.$message({
-          type: 'warning',
+          type: 'error',
           message: '请先同意隐私声明和账号使用协议'
         });
           return
         }
       }
       else{
-        console.log('===')
        let data=await this.vadmsg();
         if(data.code=="1")
         {
-               data = await userregOrLogin(this.tel);
-               console.log(data);
-           let token=JSON.stringify(data);
-            this.changeClod({ cloud: token });
-            this.checkIsLogin();
-          if(data.type==1){
-            if(data.data.memberName===undefined){
-              this.$message({
-              type: 'warning',
-              message: '欢迎回来'
-            });
-            console.log('-----')
-            }
-            else{
-              this.$message({
-              type: 'warning',
-              message: '欢迎回来'+data.data.memberName
-            });
-            }
-          }else if(data.type==2){
-                  this.$message({
-              type: 'warning',
-              message: '恭喜注册成功'
-            });
-                 let couponId='0000000123';
-            this.serdiscount(this.tel,couponId);
-            setTimeout(() => {
-              this.serdiscount(this.tel,"0000000140");
-            }, 100);
-            setTimeout(() => {
-              this.serdiscount(this.tel,"0000000122");
-            }, 500);
-          }
-            this.$router.push({
-              path: "/",
-            });
+			data = await userregOrLogin(this.tel);
+			let token=JSON.stringify(data);
+			this.changeClod({ cloud: token });
+			this.checkIsLogin();
+			let returnMessage='';
+			if(data.type==1) {
+				if(data.data.memberName===undefined){
+					returnMessage = '欢迎回来';
+				}
+				else{
+					returnMessage = '欢迎回来'+data.data.memberName;
+				}
+				_hmt.push([
+				    "_trackCustomEvent",
+				    "login",
+				    {}
+				])
+			} else if(data.type==2) {
+				returnMessage = '恭喜注册成功';
+				_hmt.push([
+					"_trackCustomEvent",
+					"register",
+					{}
+				])
+				
+				let curEnv = process.env.NODE_ENV;
+				let newGuestCouponCodes = envData[curEnv].newGuestCoupon;
+				let couponId=newGuestCouponCodes[0];
+				this.serdiscount(this.tel,couponId);
+				setTimeout(() => {
+					this.serdiscount(this.tel,newGuestCouponCodes[1]);
+				}, 100);
+				setTimeout(() => {
+					this.serdiscount(this.tel,newGuestCouponCodes[2]);
+				}, 500);
+				setTimeout(() => {
+					this.serdiscount(this.tel,newGuestCouponCodes[3]);
+				}, 500);
+			}
+			this.$router.push({
+				path: "/",
+				query:{msg:returnMessage}
+			});
         }else{
-               this.$message({
-          type: 'warning',
-          message: data.msg,
-        });
+			this.$message({
+			  type: 'warning',
+			  message: data.msg,
+			});
         return
         }
       }},
diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue
index e79cf7dc..14da32d1 100644
--- a/rc-busness/pages/usersearch/search.vue
+++ b/rc-busness/pages/usersearch/search.vue
@@ -78,7 +78,7 @@
               </ol>
             </div>
 
-            <div class="ts-scrollable-container">
+            <div class="ts-scrollable-container" v-if="!inRxGoods">
               <h2>年龄:</h2>
               <ol class="ts-scrollable">
                 <li
@@ -92,6 +92,21 @@
                 </li>
               </ol>
             </div>
+			
+			<div class="ts-scrollable-container" v-if="inRxGoods">
+			  <h2>功能:</h2>
+			  <ol class="ts-scrollable">
+			    <li
+			      v-for="(item, index) in rxFilters"
+			      :key="index"
+			      @click="selectFilter(item, index)"
+			      :class="item.checked ? 'active' : 'unactive'"
+			    >
+			      {{ item.tagName }}
+			    </li>
+			  </ol>
+			</div>
+			
           </div>
         </div>
       </div>
@@ -177,7 +192,7 @@
                 </ol>
               </div>
 
-              <div class="ts-scrollable-container">
+              <div class="ts-scrollable-container" v-if="!inRxGoods">
                 <h2>年龄:</h2>
                 <ol class="ts-scrollable">
                   <li
@@ -191,7 +206,7 @@
                   </li>
                 </ol>
               </div>
-              <div class="ts-scrollable-container">
+              <div class="ts-scrollable-container" v-if="!inRxGoods">
                 <h2>功能:</h2>
                 <ol class="ts-scrollable">
                   <li
@@ -205,7 +220,7 @@
                   </li>
                 </ol>
               </div>
-              <div class="ts-scrollable-container">
+              <div class="ts-scrollable-container" v-if="!inRxGoods">
                 <h2>品种:</h2>
                 <ol class="ts-scrollable">
                   <li
@@ -220,6 +235,20 @@
                 </ol>
               </div>
            
+			  <div class="ts-scrollable-container" v-if="inRxGoods">
+			    <h2>功能:</h2>
+			    <ol class="ts-scrollable">
+			      <li
+			        v-for="(item, index) in rxFilters"
+			        :key="index"
+			        @click="selectFilter(item, index)"
+			        :class="item.checked ? 'active' : 'unactive'"
+			      >
+			        {{ item.tagName }}
+			      </li>
+			    </ol>
+			  </div>
+			  
             </div>
           </div>
 		  
@@ -263,7 +292,7 @@
               </ol>
             </div>
 
-            <div class="ts-scrollable-container">
+            <div class="ts-scrollable-container" v-if="!inRxGoods">
               <h2>年龄:</h2>
               <ol class="ts-scrollable">
                 <li
@@ -277,7 +306,7 @@
                 </li>
               </ol>
             </div>
-            <div class="ts-scrollable-container">
+            <div class="ts-scrollable-container" v-if="!inRxGoods">
               <h2>功能:</h2>
               <ol class="ts-scrollable">
                 <li
@@ -291,7 +320,7 @@
                 </li>
               </ol>
             </div>
-            <div class="ts-scrollable-container">
+            <div class="ts-scrollable-container" v-if="!inRxGoods">
               <h2>品种:</h2>
               <ol class="ts-scrollable">
                 <li
@@ -305,6 +334,19 @@
                 </li>
               </ol>
             </div>
+			<div class="ts-scrollable-container" v-if="inRxGoods">
+			  <h2>功能:</h2>
+			  <ol class="ts-scrollable">
+			    <li
+			      v-for="(item, index) in rxFilters"
+			      :key="index"
+			      @click="selectFilter(item, index)"
+			      :class="item.checked ? 'active' : 'unactive'"
+			    >
+			      {{ item.tagName }}
+			    </li>
+			  </ol>
+			</div>
           </div>
         </div>
 		<!--
@@ -331,16 +373,19 @@ import Myheader from "~/components/header.vue";
 import MyFooter from '~/components/rc-footer.vue'
 import FixRight from "~/components/fixed-right.vue";
 import tabs from "~/components/tabs.vue";
-import { biaome, userstype, searchchanpin, userquery } from "../../ajax/getData";
+import { biaome, userstype, searchchanpin, userquery, userque } from "../../ajax/getData";
+import envData from "~/config/env-data.js";
 export default {
   data() {
     return {
       value: "",
+	  envData,
 	  crumbs:[
 	  	{
 	  		path:'/usersearch/search/',
 	  	}
 	  ],
+	  rxFilters:[],
       isLoading: true,
       userserachlist: [
         {
@@ -528,6 +573,10 @@ export default {
   mounted() {
     this.usetmessage();
     this.userst();
+	//Handling RxGoods filter
+	let curEnv = process.env.NODE_ENV;
+	this.rxFilters = envData[curEnv].rxGoodsFilter;
+	//Handling RxGoods filter end
   },
   methods: {
     //换一批
@@ -605,6 +654,15 @@ export default {
 			this.isLoading=false;
 		}
     },
+	async getRxGoodsByFunc(functionName) {
+	  this.isLoading = true;
+	  let petType = this.activeIndex1;
+	  let data = await userque(functionName, petType, 1, 20);
+	  if (data) {
+	    this.rccontair = data;
+	    this.isLoading = false;
+	  }
+	},
     async userst() {
       this.isLoading = true;
       let pinzhong = [];
@@ -721,6 +779,19 @@ export default {
 			this.inRxGoods=false;
 		}
 	},
+	selectFilter(item) {
+		for(let tmp of this.rxFilters) {
+			if(item.tagValue == tmp.tagValue) {
+				item.checked = !item.checked;
+			} else {
+				tmp.checked = false;
+			}
+		}
+		if(item.checked)
+			this.getRxGoodsByFunc(item.tagValue);
+		else
+			this.getRxGoodsByFunc();
+	},
 	resetAllOptions(){
 		let _self = this;
 		let categoriesSelectionEles=this.prefecture;
@@ -731,6 +802,7 @@ export default {
 		allSelectionEles.forEach(function(tmp,index){
 			tmp.checked=false;
 		});
+		this.checkRxGoods(false);
 		this.userserachlist = [
 			{
 				categoryName: [], //专区
diff --git a/rc-busness/static/images/qrcode-minishop.png b/rc-busness/static/images/qrcode-minishop.png
new file mode 100644
index 00000000..f732b6b9
Binary files /dev/null and b/rc-busness/static/images/qrcode-minishop.png differ
diff --git a/rc-busness/static/js/date.js b/rc-busness/static/js/date.js
index 5b05c6ac..dcfac30f 100644
--- a/rc-busness/static/js/date.js
+++ b/rc-busness/static/js/date.js
@@ -12,7 +12,8 @@ Vue.prototype.formatConversion = function (te){
 		var h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
 		var mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
 		var s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
-		var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s;
+		//var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s;
+		var timedate = y + '-' + m + '-' + d;
 		return timedate;
 	}else{
 		var time = new Date(te);
@@ -22,7 +23,8 @@ Vue.prototype.formatConversion = function (te){
 		var h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
 		var mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
 		var s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
-		var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s;
+		//var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s;
+		var timedate = y + '-' + m + '-' + d;
 		return timedate;
 	}
 }
\ No newline at end of file
diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml
index 9431ef48..614d201d 100644
--- a/smart-admin-service/pom.xml
+++ b/smart-admin-service/pom.xml
@@ -325,9 +325,7 @@
             <properties>
                 <profiles.active>dev</profiles.active>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
         </profile>
         <profile>
             <id>telework</id>
@@ -352,6 +350,9 @@
             <properties>
                 <profiles.active>prod</profiles.active>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
     </profiles>
 
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java
index 8f7710f3..24474c3d 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AliPayService.java
@@ -17,7 +17,6 @@ import java.util.UUID;
 @Service
 public class AliPayService {
 
-    public static String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderAliPay";
 
     @Autowired
     private OrderService orderService;
@@ -34,7 +33,7 @@ public class AliPayService {
         model.setGoodsDetail(aliPayEntity.getGoodsDetail());
         AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
         request.setBizModel(model);
-        request.setNotifyUrl(notify_url);
+        request.setNotifyUrl(AlipayConfig.notify_url);
         AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.gatewayUrl, AlipayConfig.app_id, AlipayConfig.merchant_private_key, "json", AlipayConfig.charset, AlipayConfig.alipay_public_key, AlipayConfig.sign_type);
         AlipayTradePrecreateResponse alipayTradePrecreateResponse = alipayClient.execute(request);
         if (alipayTradePrecreateResponse.isSuccess()) {
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java
index 1ee38537..33706d7b 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java
@@ -26,6 +26,7 @@ import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyServ
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -47,7 +48,8 @@ public class AlipayController {
     @Autowired
     private OrderService orderService;
 
-    String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
+    @Value("${royalcanin.goods}")
+    private String url ;
 
     @Autowired
     private MemberAccountService memberAccountService;
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java
index 4649b18f..badb8870 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java
@@ -20,6 +20,7 @@ public class AlipayConfig {
 	// 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号
 //	public static String app_id = "2016101800716209";
 	public static String app_id = "2021003108690157";
+//	public static String app_id = "2088341384149564";
 	
 	// 商户私钥，您的PKCS8格式RSA2私钥
 //	public static String merchant_private_key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL8350XEsOVVSg8+cKZEl6Jx7Tp63JFimk+lldS8chZ8hv3Netz5iMemQJYH328VEB5sKkIXfDiwT1fxR2cgsGdQgmG25omKM/47QfxTRp9C4II65AlMfLsPWOWefc/enaza/gMMzB5SvvFnbpX/71aJmqU7nJvATY8MwW4SxKXKMTEI/K7+jERReR4SxtGHeFTZ892ljr7IOqJbGPnd2CXzLO05AGGhOrsmtFMh9eysD1WzcDKoADJSi26oMI49mExGo3jMF111AcXSR4CgLsx5bSoe4XtXtVbqEr/tOCt4zAWoUbu/Mviog+60eMr9qaE719aobEZP7aI5ECd86NAgMBAAECggEAXRVBtqvU2bLaUCdhYF3LJ0QpjqIt7+P8l75nAOyv8rAiS+O4UCy6TAskEx+F/im/NiXy2eQofAe7+KvKVBDStVy+nl3Qs05O2776G7HurRjz1WUrh3AgC/g06oZgC32buPA9gA3ltez5c0KGfRcCD1FxKMrTtZ3pfHXSP/L/OuRhobxCZvEL5jcWHkxgOeaL37+UQSHJe3dhCPjjj1VOxBj0RLgcAPJ8/KoglcmWHacYvPxgRo26xahrW3yCofcb+cEzG5WhCc3uBK3eSWNB1knSwl2gVMcGmN8gOPBpAneSjqv6pqWUqgAOENxi2kRZYDyTNi3JHt2ZJMdDblU8AQKBgQD2Z+CjGGloaQTvcow/dqxF4a5EAnjeUSA+cdw7ttNqvszNofjvxv9RULKIf8jgrkO9cE5X9ezqHXaWOspyXbFhmPFginH9N5tTGggrzCpeHs7jW3EZKiYJIl2MRzxMVx1jaN8EfT8Z3u/4Ca/QwPvsGNj/Er7kwqLUvkGsLeOHjQKBgQDT5G/8R/T2LqJUvFiKntfY830WVAD9vUGst68ouxfaQKj2IOlOedjvQwRcInOX3GFnQyw8ncWOIZDQOnJdYpQdjQAx3queHmv8toCp+MKyPLLYJYu4LP6ahT/9vd9G9r0QUo57n75sVOcT5tj9ZKdykchPUWe1T02LEUZPxDwjAQKBgQCnf7meZMvSpAEs3EsmIP++iUkzBhMv3Sn0COZS2VciKw2Bg2d7Z2TL2/VhAKyGvy9hKWS4On6QLvMb8F8KG1KnK5Z5r+MI5LH7bai8TQ9H591vhAt/tb0hXHEHGK2On3Fk0Dc6EAHDDl9F1x/i4izeM43e5tlJHF4gDC0MZC1VSQKBgQDMS1yZXXtV/GJw1mN7y2iK+T/qTjXibx2p/DO6TqDRwjPlkpe/HQXGsdO7TVAr48RZvk8hZnB59+zahu+LECeEUlUUv/6xZd1x+zgUKQ72sEUy1wheG6uiqcSnzfA/SFfDLAXKNZtwcW+WJaWisfAsK1h4+SDHk91MruwerjHZAQKBgH6muiaSlg6DvAUBjtxaOE0bgchI+M/j7N4289syb/6A0iTUNeTREWk2kmBT/ZeZCFtrjJx+TdVauyjkRwKx0wEuf9H+WrUM+6i5j5nTrcUEAUTjCY7IRxGk8uhNLM7cyBNvpsD4olI5j2DmRsZWnv/bNuJH2FHbvXMwanZ22vM5";
@@ -27,7 +28,8 @@ public class AlipayConfig {
 	// 支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
 //	public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjBThgyJ3SJsx0IYUspiW+R/NDInruz2Tirr0vGmzfaNkBSDmyg2vNLmnkNrxbHApJkIRKWqGbC8yPybyjFz1nXP7oji0d/3sPKZZGdNEqOcZLaki8xPeXfOVu1T/uPH/9S084t94yQPNrD9BqehOlN+I4b/mXJ7tDGRnS2OVrQqDrPbg8pjH3OYa0bELkr71R92EHxCN4V2bSdCS1ag96/etgkodduOCmiBPVSmSRXas/GpRw92NVsRKvesWOatfjEjqST0Bz0nRuOuRnQIy1exxs/D2DHCVa6aO6TNogcPWe3C9dvxjxjw9IOiyhkGThWoWrdk8Ot+V8V8LeomcYwIDAQAB";
 //	public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr+fwsHUR8dosvQlrQk1uKu8bzWtt4BHRIK4PsY5IVPUuk/NbcSXH9HC/tyj/L4L68/9pxteG7nGMioveqSMx8d5jhf/1sHsBC2C/BiffjzfiaeKsPqIag2jM0GNVFnrtmx1xeKYwx8T3X87BH7T4lcrOqsjt7JCtXDgWlttEpiIJTLTPOgtMlFPLkwvvp/Dlc0f+t2Bo9bHaCkrOkq3AC9TACEzXCVBKIP670MD0rTLnCEr3E/9oKzQazcCydzj548LAmwSQ660Wh+w6pZrL8p43ODski4sbl5ulidw7MklDHKOdZFj/tWf2NqMQjmAdmthZ5oGilJhiLvHiUR1YyQIDAQAB";
-	public static String alipay_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
+	public static String alipay_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9yEe5sOFYFmEW0GdVCyvuU5vXCLsk2lwWmfC/bh/kcjBaBNTaFSiuG1VFPWsNIKWEHLdbEwMQnq4WxhqYN741wXxJlOpvsECFYtGSL6szx7BDaTYATQGVk963SeKYplz5ZPlXg1QiKgcqS3brvnpxxtcS1JKCJ/6iJXJkZXxK2QIDAQAB";
+//	public static String alipay_public_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
 	// 服务器异步通知页面路径  需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
 	public static String notify_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderAliPay";
 	// 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java
index bfeb7e43..6552a2a3 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/login/LoginTokenService.java
@@ -38,7 +38,8 @@ import java.util.UUID;
 @Service
 public class LoginTokenService {
 
-    private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/member/";
+    @Value("${royalcanin.member}")
+    private String url;
 
     /**
      * 过期时间一天
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
index 85080b4e..a88c4901 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
@@ -5,15 +5,16 @@ import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfig
 import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigGetEntity;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @Service
 public class CouponConfigService {
 
-    private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/";
+    @Value("${royalcanin.couponconfig}")
+    private String url ;
 
     public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
index dd1a7a14..25043477 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
@@ -4,15 +4,17 @@ import net.lab1024.smartadmin.common.heartbeat.StringUtil;
 import net.lab1024.smartadmin.module.system.royalcanin.coupon.*;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @Service
 public class CouponService {
 
-    private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/";
+
+    @Value("${royalcanin.coupon}")
+    private String url ;
 
     public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponCancelEntity);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java
index 0b388849..5e7bd3ef 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java
@@ -5,9 +5,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccou
 import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountHistoryEntity;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -16,7 +16,8 @@ import java.util.Map;
 @Service
 public class MemberAccountService {
 
-    private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/";
+    @Value("${royalcanin.memberaccount}")
+    private String url ;
 
     public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity){
         memberAccountChangeEntity.setChannelId(15);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java
index e8bf3682..5ef6d169 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java
@@ -7,16 +7,16 @@ import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddre
 import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressUpdateEntity;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @Service
 public class MemberAddressService {
-    private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAddress/";
-
+    @Value("${royalcanin.memberaddress}")
+    private String url ;
 
     public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception {
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(memberAddressGetAllEntity);
@@ -24,14 +24,14 @@ public class MemberAddressService {
         return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null);
     }
 
-    public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) throws Exception{
+    public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) {
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(memberAddressAddEntity);
         MapRemoveNullUtil.removeNullEntry(paramMap);
         net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
         return SmartHttpUtil.httpPostRaw(url+"add",jsonObject.toString(),null,"utf-8");
     }
 
-    public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity) throws Exception{
+    public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity){
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(memberAddressUpdateEntity);
         paramMap.put("id",StringUtil.toString(memberAddressUpdateEntity.equals("0")?null:StringUtil.toString(memberAddressUpdateEntity.getId())));
         MapRemoveNullUtil.removeNullEntry(paramMap);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
index 60772a28..df9925b2 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
@@ -6,20 +6,15 @@ import net.lab1024.smartadmin.module.system.royalcanin.member.*;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartJWTUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 @Service
 public class MemberService {
-    private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/member/";
-
-
-
-
-
-
+    @Value("${royalcanin.member}")
+    private String url ;
 
     public String memberGet(MemberGetEntity memberGetEntity)throws Exception {
         Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
index b9058627..ab8aaa66 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
@@ -73,13 +73,13 @@ public class TransitionController {
         switch (type)
         {
             case "get":
-                result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class)).toString();
+                result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class));
                 break;
             case "check":
                 result = memberService.memberCheck(objectMapper.convertValue(object,MemberCheckEntity.class));
                 break;
             case "add":
-                result = memberService.memberAdd(objectMapper.convertValue(object,MemberAddEntity.class)).toString();
+                result = memberService.memberAdd(objectMapper.convertValue(object,MemberAddEntity.class));
                 break;
             case "updateMemberLevel":
                 result = memberService.memberUpdateMemberLevel(objectMapper.convertValue(object, MemberUpdateMemberLevelEntity.class));
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java
index ddf13acb..e1cc7c96 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java
@@ -2,7 +2,6 @@ package net.lab1024.smartadmin.module.system.royalcanin.good;
 
 
 
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.common.anno.OperateLog;
@@ -118,16 +117,21 @@ public class GoodController {
             }
 
         }
+        String result  = "";
+        try{
+            long startTime = System.currentTimeMillis();
+            result = goodService.brandQuery(productQueryEntity);
+            long acceptTime = System.currentTimeMillis() ;
+            long elapsedTime = acceptTime - startTime;
+            //记录服务响应时间
+            addOperatreFullData("royalcanin/h5/product/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL");
+            return result;
+        }catch (Exception e){
+            System.out.println(e.getMessage());
+        }finally {
+            return result;
+        }
 
-
-
-        long startTime = System.currentTimeMillis();
-        String result  = goodService.brandQuery(productQueryEntity);
-        long acceptTime = System.currentTimeMillis() ;
-        long elapsedTime = acceptTime - startTime;
-        //记录服务响应时间
-        addOperatreFullData("royalcanin/h5/product/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL");
-        return result;
     }
 
     @ApiOperation(value = "查询商品信息", notes = "查询商品信息")
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
index 22005238..7e7e6424 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
@@ -3,7 +3,6 @@ package net.lab1024.smartadmin.module.system.royalcanin.good;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.internal.util.AlipaySignature;
-import com.beust.jcommander.Parameter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.common.anno.OperateLog;
@@ -19,7 +18,6 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderRespon
 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.model.ProductMasterQueryEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
 import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity;
@@ -28,18 +26,13 @@ import net.lab1024.smartadmin.module.system.wxpay.MyConfig;
 import net.lab1024.smartadmin.module.system.wxpay.WxpayService;
 import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
 import net.lab1024.smartadmin.util.GenerateSequenceUtil;
-import net.lab1024.smartadmin.util.MapRemoveNullUtil;
-import net.lab1024.smartadmin.util.SmartHttpUtil;
 import net.sf.json.JSONArray;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URLEncodedUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.net.URLEncoder;
 import java.util.*;
 
 @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API})
@@ -77,65 +70,73 @@ public class OrderController {
         JSONArray orderDatilListJson = new JSONArray();
         OrdersEntity ordersEntity = new OrdersEntity();
         OrderAddress orderAddress  = new OrderAddress();
-        for (OrdersEntity ordersEntitys:ordersEntityList) {
-            cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductCode());
-            //存储orderDetailList
-            OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity();
-            orderDatilListEntity.setProductName(ordersEntitys.getProductName());
-            orderDatilListEntity.setPcs(ordersEntitys.getBuyCount());
-            orderDatilListEntity.setProductCode(ordersEntitys.getProductCode());
-            orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount());
-            orderDatilListJson.add(orderDatilListEntity);
-            if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
-                CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity ();
-                couponGetAllEntity.setMemberId(ordersEntitys.getMemberId());
-                couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode());
-                String couponInfo = couponService.couponGetAll(couponGetAllEntity);
-                JSONObject jsonObject = JSONObject.parseObject(couponInfo);
-                com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data"));
-                JSONObject jsonObjectData = (JSONObject)jsonArray.get(0);
+        try {
+            for (OrdersEntity ordersEntitys : ordersEntityList) {
+//                System.out.println("ordersEntityList.size()"+ordersEntityList.size());
+                cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode());
+                //存储orderDetailList
+                OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity();
+                orderDatilListEntity.setProductName(ordersEntitys.getProductName());
+                orderDatilListEntity.setPcs(ordersEntitys.getBuyCount());
+                orderDatilListEntity.setProductCode(ordersEntitys.getProductCode());
+                orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount());
+                orderDatilListJson.add(orderDatilListEntity);
+                if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
+                    CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity();
+                    couponGetAllEntity.setMemberId(ordersEntitys.getMemberId());
+                    couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode());
+                    String couponInfo = couponService.couponGetAll(couponGetAllEntity);
+                    JSONObject jsonObject = JSONObject.parseObject(couponInfo);
+                    com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data"));
+                    JSONObject jsonObjectData = (JSONObject) jsonArray.get(0);
 
-                ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ?jsonObjectData.getString("discount"):jsonObjectData.getString("couponAmount"));
-                ordersEntity.setCouponCode(jsonObjectData.getString("couponCode"));
-                ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
-                ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
-                total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount());
-            }else{
-                total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ;
+                    ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ? jsonObjectData.getString("discount") : jsonObjectData.getString("couponAmount"));
+                    ordersEntity.setCouponCode(jsonObjectData.getString("couponCode"));
+                    ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
+                    ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
+                    total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(), Double.parseDouble(ordersEntitys.getCouponAmount()), Double.parseDouble(ordersEntitys.getPayAmount()), ordersEntitys.getBuyCount());
+                } else {
+                    total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount();
+                }
+                basePoint = basePoint + ordersEntitys.getBasePoint();
+//                System.out.println("basePoint"+basePoint);
+                orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
+                orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName());
+                orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo());
+                orderAddress.setAddressPhoneNumber(ordersEntitys.getOrderAddress().getAddressPhoneNumber());
+                orderAddress.setAddressUserName(ordersEntitys.getOrderAddress().getAddressUserName());
+                orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName());
+                productId.append(ordersEntitys.getProductCode() + ",");
+                productName.append(ordersEntitys.getProductName() + ",");
+                memberId = ordersEntitys.getMemberId();
+                mobile = ordersEntitys.getPhoneNumber();
+                buyCount = buyCount + ordersEntitys.getBuyCount();
             }
-            basePoint = basePoint + ordersEntitys.getBasePoint();
-            orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
-            orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName());
-            orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo());
-            orderAddress.setAddressPhoneNumber(ordersEntitys.getOrderAddress().getAddressPhoneNumber());
-            orderAddress.setAddressUserName(ordersEntitys.getOrderAddress().getAddressUserName());
-            orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName());
-            productId.append(ordersEntitys.getProductCode()+",");
-            productName.append(ordersEntitys.getProductName()+",");
-            memberId = ordersEntitys.getMemberId();
-            mobile = ordersEntitys.getPhoneNumber();
-            buyCount = buyCount + ordersEntitys.getBuyCount();
-        }
-        ordersEntity.setOrderAddress(orderAddress);
-        ordersEntity.setProductCode(productId.substring(0,productId.length()-1));
-        ordersEntity.setProductName(productName.substring(0,productName.length()-1));
-        ordersEntity.setOrderAmount(StringUtil.toString(total_fee));
-        ordersEntity.setMemberId(memberId);
-        ordersEntity.setPhoneNumber(mobile);
-        ordersEntity.setBuyCount(buyCount);
-        ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
-        ordersEntity.setOrderStatus("0");
-        ordersEntity.setBasePoint(basePoint);
-
-        if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){
-            wxPayEntity.setProduct_id(ordersEntity.getProductCode());
-            wxPayEntity.setTotal_fee(StringUtil.toString(total_fee));
-            wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
-            Map<String, String> returnMap = new HashMap<>();
-            returnMap.put("orderNumber",ordersEntity.getOrderNo());
-            returnMap.put("orderAmount",ordersEntity.getOrderAmount());
-//            return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity));
-            return ResponseDTO.succData(returnMap,wxpayService.testGenerateQRCode(wxPayEntity));
+            ordersEntity.setOrderAddress(orderAddress);
+            ordersEntity.setProductCode(productId.substring(0, productId.length() - 1));
+            ordersEntity.setProductName(productName.substring(0, productName.length() - 1));
+            ordersEntity.setOrderAmount(StringUtil.toString(total_fee));
+            ordersEntity.setMemberId(memberId);
+            ordersEntity.setPhoneNumber(mobile);
+            ordersEntity.setBuyCount(buyCount);
+            ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
+            ordersEntity.setOrderStatus("0");
+            ordersEntity.setBasePoint(basePoint);
+            int result = orderService.generateOrder(ordersEntity, orderDatilListJson);
+            if (result == 1) {
+                System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson)  == 1");
+                wxPayEntity.setProduct_id(ordersEntity.getProductCode());
+                wxPayEntity.setTotal_fee(StringUtil.toString(total_fee));
+                wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
+                Map<String, String> returnMap = new HashMap<>();
+                returnMap.put("orderNumber", ordersEntity.getOrderNo());
+                returnMap.put("orderAmount", ordersEntity.getOrderAmount());
+                return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity));
+            }else if (result == 3){
+                return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_FAIL_COUPONDED);
+            }
+        }catch (Exception e){
+            System.out.println(e.getMessage());
         }
         return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL);
     }
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java
index d532794f..ee32608c 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java
@@ -12,6 +12,8 @@ public class OrderResponseCodeConst extends ResponseCodeConst {
 
     public static final OrderResponseCodeConst GENERATE_FAIL = new OrderResponseCodeConst(9003, "数据生成失败！");
 
+    public static final OrderResponseCodeConst GENERATE_FAIL_COUPONDED = new OrderResponseCodeConst(9004, "优惠券已使用！");
+
     public static final OrderResponseCodeConst SMS_FAIL = new OrderResponseCodeConst(9005, " 短信校验失败！");
 
     public static final OrderResponseCodeConst SMS_OVERTIME = new OrderResponseCodeConst(9006, "短信校验超时！");
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
index 02119fc5..e64431c3 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
@@ -1,21 +1,21 @@
 package net.lab1024.smartadmin.module.system.royalcanin.good.service;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import net.lab1024.smartadmin.common.heartbeat.StringUtil;
 import net.lab1024.smartadmin.module.system.royalcanin.good.dao.GoodsDao;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.GoodsEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductQueryEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.model.ProductSearchTagEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service.ProductSearchTagService;
 import net.lab1024.smartadmin.util.AESUtil;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
-import net.lab1024.smartadmin.util.SmartIPUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,7 +24,11 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class GoodService {
 
-    String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
+    @Value("${royalcanin.goods}")
+    private String url;
+
+    @Value("${royalcanin.goods.ip}")
+    private String goodsIp;
 
     @Autowired
     private GoodsDao goodsDao;
@@ -32,16 +36,22 @@ public class GoodService {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private ProductSearchTagService productSearchTagService;
+
+
     public GoodsEntity listGoodsByProductCode(String productCode){
-        return goodsDao.findByProductCode(productCode);
+        GoodsEntity goodsEntity = goodsDao.findByProductCode(productCode);
+        goodsEntity.setShowImgFile(goodsIp+goodsEntity.getShowImgFile());
+        goodsEntity.setPicture(goodsIp+goodsEntity.getPicture());
+        return goodsEntity;
     }
 
     public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title,String petType){
-        String ip = "https://royalcanincn.escase.cn/jc/royalcanin/";
         List<GoodsEntity> goodsList  = goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title,petType);
         for (GoodsEntity goodsEntity:goodsList) {
-            goodsEntity.setShowImgFile(ip+goodsEntity.getPicture());
-            goodsEntity.setPicture(ip+goodsEntity.getPicture());
+            goodsEntity.setShowImgFile(goodsIp+goodsEntity.getShowImgFile());
+            goodsEntity.setPicture(goodsIp+goodsEntity.getPicture());
         }
         return goodsList;
     }
@@ -80,6 +90,21 @@ public class GoodService {
         String sb = SmartHttpUtil.sendPostForm(url+"productSearchTag/query",paramMap,null);
         JSONObject jsonObject = JSONObject.parseObject(sb);
         String result = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
+        productSearchTagService.deleteAllSearchTag();
+        com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(result);
+        for (int i = 0; i < jsonArray.size();i++){
+            JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i);
+            ProductSearchTagEntity productSearchTagEntity = new ProductSearchTagEntity();
+            productSearchTagEntity.setBrandCode("16518816");
+            productSearchTagEntity.setBrandName(jsonObjectResult.getString("name"));
+            productSearchTagEntity.setIsDelete("0");
+            productSearchTagEntity.setId(jsonObjectResult.getString("id"));
+            productSearchTagEntity.setPetType(jsonObjectResult.getString("petType"));
+            productSearchTagEntity.setTagName(jsonObjectResult.getString("tagName"));
+            productSearchTagEntity.setTagType(jsonObjectResult.getString("tagType"));
+            productSearchTagEntity.setTagCode(jsonObjectResult.getString("tagCode"));
+            productSearchTagService.installAllSearchTag(productSearchTagEntity);
+        }
         return result;
     }
 
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
index eafefa42..1772a63b 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
@@ -24,11 +24,13 @@ import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
 import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -46,61 +48,69 @@ public class OrderService {
     @Autowired
     private NotifyService notifyService;
 
-    private String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/";
+    @Value("${royalcanin.order}")
+    private String url ;
 
     @Transactional
     public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception {
         AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity();
-        if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) {
-            CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
-            couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode());
-            couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo());
-            couponCosumeEntity.setProductCode(ordersEntity.getProductCode());
-            BigDecimal realCouponAmount =new BigDecimal(ordersEntity.getOrderAmount());
-            couponCosumeEntity.setRealCouponAmount(realCouponAmount);
-            JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity));
-            if(!jsonObject.getString("code").equals("0")) {
+        try {
+            if (ordersEntity.getCouponCode() != "" && null != ordersEntity.getCouponCode()) {
+                CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
+                couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode());
+                couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo());
+                couponCosumeEntity.setProductCode(ordersEntity.getProductCode());
+                BigDecimal realCouponAmount = new BigDecimal(ordersEntity.getOrderAmount());
+                couponCosumeEntity.setRealCouponAmount(realCouponAmount);
+                JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity));
+                if (!jsonObject.getString("code").equals("0")) {
+                    return 3;
+                }
+                //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());
+            }
+
+            Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(ordersEntity);
+            paramMap.remove("orderAddress");
+            paramMap.remove("couponTypeId");
+            ObjectMapper objectMapper = new ObjectMapper();
+            OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class);
+            if (ordersDao.insert(orderEntity) == 1) {
+                ordersEntity.setOrderStatus("0");
+                addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber());
+                addOrSaveEntity.setStatus("0");
+                addOrSaveEntity.setOrderNumber(ordersEntity.getOrderNo());
+                addOrSaveEntity.setSalesAmount(ordersEntity.getOrderAmount());
+                addOrSaveEntity.setOrderDetailList(listJson.toString());
+                OrderAddress orderAddress = ordersEntity.getOrderAddress();
+
+                addOrSaveEntity.setAddressCityName(orderAddress.getAddressCityName());
+                addOrSaveEntity.setAddressCountyName(orderAddress.getAddressCountyName());
+                addOrSaveEntity.setAddressDetailInfo(orderAddress.getAddressDetailInfo());
+                addOrSaveEntity.setAddressPhoneNumber(orderAddress.getAddressPhoneNumber());
+                addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName());
+                addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName());
+                JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity));
+
+                if (jsonObject.getString("code").equals("1"))
+                    return 1;
+                else
+                    return 0;
+            } else {
                 return 0;
             }
-            //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());
-        }
-
-        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(ordersEntity);
-        paramMap.remove("orderAddress");
-        paramMap.remove("couponTypeId");
-        ObjectMapper objectMapper = new ObjectMapper();
-        OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class);
-        if(ordersDao.insert(orderEntity) == 1) {
-            ordersEntity.setOrderStatus("0");
-            addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber());
-            addOrSaveEntity.setStatus("0");
-            addOrSaveEntity.setOrderNumber(ordersEntity.getOrderNo());
-            addOrSaveEntity.setSalesAmount(ordersEntity.getOrderAmount());
-            addOrSaveEntity.setOrderDetailList(listJson.toString());
-            OrderAddress orderAddress = ordersEntity.getOrderAddress();
-
-            addOrSaveEntity.setAddressCityName(orderAddress.getAddressCityName());
-            addOrSaveEntity.setAddressCountyName(orderAddress.getAddressCountyName());
-            addOrSaveEntity.setAddressDetailInfo(orderAddress.getAddressDetailInfo());
-            addOrSaveEntity.setAddressPhoneNumber(orderAddress.getAddressPhoneNumber());
-            addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName());
-            addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName());
-            JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity));
-            if(jsonObject.getString("code").equals("1"))
-                return 1;
-            else
-                return 0;
-        }else {
-            return 0;
+        }catch (Exception e){
+            System.out.println(e.getMessage()
+            );
         }
+        return 0;
     }
 
     public int checkNotify(String orderNumber){
@@ -209,11 +219,13 @@ public class OrderService {
         jsonObject.put("orderCoupon",orderCoupon);
         jsonObject.put("orderDetailList",detailList);
         long startTime = System.currentTimeMillis();
-        String result = SmartHttpUtil.httpPostRaw(url+"addOrSave?channelId=15&secret=H5@2021",jsonObject.toString(),null,"utf-8");
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type","application/json");
+        String result = SmartHttpUtil.httpPostRaw(url+"addOrSave?channelId=15&secret=H5@2021",jsonObject.toString(),headers,"utf-8");
         long acceptTime = System.currentTimeMillis() ;
         long elapsedTime = acceptTime - startTime;
         //记录服务响应时间
-        addOperatreFullData(url+"addOrSave",addOrSaveEntity.toString(),result, startTime,elapsedTime,acceptTime);
+        addOperatreFullData(url+"orderMaster/addOrSave",addOrSaveEntity.toString(),result, startTime,elapsedTime,acceptTime);
         return result;
     }
 
@@ -229,15 +241,15 @@ public class OrderService {
         com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult);
         for (int i = 0; i < jsonArray.size();i++){
             JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i);
-                OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber"));
-                if (orderEntity == null){
-                    jsonObjectResult.put("paytype","0");
-                    jsonObjectResult.put("basePoint","0");
-                }else {
-                    //新增支付方式paytype
-                    jsonObjectResult.put("paytype",orderEntity.getPayType());
-                    jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
-                }
+            OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber"));
+            if (orderEntity == null){
+                jsonObjectResult.put("paytype","0");
+                jsonObjectResult.put("basePoint","0");
+            }else {
+                //新增支付方式paytype
+                jsonObjectResult.put("paytype",orderEntity.getPayType());
+                jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
+            }
 
         }
         //记录服务响应时间
@@ -273,13 +285,13 @@ public class OrderService {
                 endTotal = total * buyCount - discount;
                 break;
             case "3":
-                endTotal = (total * buyCount) * discount;
+                endTotal = (total * buyCount) * (1-discount);
                 break;
             case "1" :
                 endTotal = total * buyCount - discount;
                 break;
             case "4" :
-                endTotal = (total * buyCount) * discount;
+                endTotal = (total * buyCount) * (1-discount);
                 break;
             case "6" :
                 endTotal = total * buyCount - discount;
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java
index dca1469d..6cdcb309 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java
@@ -13,4 +13,7 @@ import java.util.List;
 public interface ProductSearchTagDao extends BaseMapper<ProductSearchTagEntity> {
 
     List<ProductSearchTagEntity> findAllByCondition(@Param("brandNameList") List<String> brandNameList,@Param("petType")String petType,@Param("tagNameList") List<String> tagNameList,@Param("tagStatus")String tagStatus);
+
+
+    int deleteAllProductSearchTag();
 }
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java
index 0b707e3e..aa23020e 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java
@@ -17,4 +17,12 @@ public class ProductSearchTagService {
     public List<ProductSearchTagEntity> findAllByCondition( List<String> brandNameList,String petType,List<String> tagNameList,String tagStatus){
         return productSearchTagDao.findAllByCondition(brandNameList,petType,tagNameList,tagStatus);
     }
+
+    public void deleteAllSearchTag(){
+        productSearchTagDao.deleteAllProductSearchTag();
+    }
+
+    public int installAllSearchTag(ProductSearchTagEntity ProductSearchTagEntity){
+        return productSearchTagDao.insert(ProductSearchTagEntity);
+    }
 }
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
index 5c1e109c..63de0f70 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
@@ -12,18 +12,19 @@ import java.io.*;
 public class MyConfig implements WXPayConfig {
 
 //    private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/";
-    private String path ="/home/royalcanin-dev/cert/pro/";
+    private String path ="/var/www/html/shop/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/";
 
 //    public  String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX";
 
-    public String notify_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderWX";
+    public String notify_url = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/updateOrderWX";
 
     // 微信支付h5 回调地址
-    public static String NOTIFY_URL_H5 = "https://shop.royalcanin.com.cn/myorder/usertion?";
+    public static String NOTIFY_URL_H5 = "https://shop.royalcanin.com.cn";
 
     // 请求地址
     public static String UFDODER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
 
+
     private byte[] certData;
 
     public MyConfig() throws Exception {
@@ -50,6 +51,7 @@ public class MyConfig implements WXPayConfig {
         return "indexphpcorecertapicert201903200";
     }
     //b69497999e8fd1f8f1f0a9591b24eb72
+    //1DDE55AD98ED71D6EDD4A4A16996DE7B47773A8C
 
     public InputStream getCertStream() {
         ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData);
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
index fb0334d8..bb11c540 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
@@ -15,8 +15,8 @@ import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
 import net.lab1024.smartadmin.util.SmartIPUtil;
-import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,11 +25,8 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.math.BigDecimal;
 import java.net.Inet4Address;
 import java.net.InetAddress;
-import java.net.URLEncoder;
-import java.text.DecimalFormat;
 import java.util.*;
 
 @Service
@@ -49,31 +46,8 @@ public class WxpayService {
     @Autowired
     private MemberAccountService memberAccountService;
 
-    String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
-
-    private String urlNative = "https://api.mch.weixin.qq.com/v3/pay/transactions/native";
-
-    public String testGenerateQRCode(WxPayEntity wxPayEntity)throws Exception{
-        String Authorization = "WECHATPAY2-SHA256-RSA2048";
-        long timestamp = System.currentTimeMillis();
-        SortedMap<String,String> data  = new TreeMap<>();
-        SortedMap<String, Integer> amount  = new TreeMap<>();
-        amount.put("total",Integer.parseInt(getMoney(wxPayEntity.getTotal_fee())));
-        data.put("out_trade_no",wxPayEntity.getOut_trade_no());
-        data.put("notify_url",config.notify_url);
-        data.put("description","皇家宠物食品官方商城");
-        data.put("appid",config.getAppID());
-        data.put("mchid",config.getMchID());
-        net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(data);
-        jsonObject.put("amount",amount);
-        SortedMap<String ,String>hearder = new TreeMap<>();
-        hearder.put("Accept","application/json");
-        hearder.put("Authorization",Authorization +" mchid="+config.getMchID() +",nonce_str=" + WXPayUtil.generateNonceStr() + ",timestamp=" + timestamp + ",signature=" + WXPayUtil.generateSignature(data, config.getKey()) + ",serial_no=" + config.getKey());
-        String sb = SmartHttpUtil.httpPostRaw(urlNative,jsonObject.toString(),hearder,"utf-8");
-        return sb;
-    }
-
-
+    @Value("${royalcanin.goods}")
+    private String url;
 
     public String generateQRCode(WxPayEntity wxPayEntity) throws Exception {
         WXPay wxpay = new WXPay(config);
@@ -120,8 +94,7 @@ public class WxpayService {
                 // 更新订单状态
                 if ("SUCCESS".equals(sortedMap.get("result_code"))) {
                     String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    String totalFee = StringUtil.toString(df.format(df.format(Double.parseDouble(sortedMap.get("total_fee")) / 100))); // 交易金额
+                    String totalFee = sortedMap.get("total_fee"); // 交易金额
                     OrderEntity orderEntity = orderService.findByOrderId(outTradeNo);
                     String [] products = orderEntity.getProductCode().split(",");
                     ProductMasterQueryEntity productMasterQueryEntity = new ProductMasterQueryEntity();
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java
index cf0d164e..97b36485 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java
@@ -166,7 +166,7 @@ public class AESUtil {
 //        String content = "{'repairPhone':'18547854787','customPhone':'12365478965','captchav':'58m7'}";
 //        System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
-        String encrypt = "C98174A5A099183A55630002D064B9CFBC3CCA4C01CA5DED75207A175FAE8E85F2D5F6F04907ADEAF008B6E80915814F900B378A3DBC1054BB6EE1DF9E356126C34F7EB19277D095637C3DFF6034B7797362C9FCEAE8A2E53E0C4824C2716C97FAAA722986D4AA95D4A381DB2515C4A7D3BFA7D7AEE174E9E6335B508957233947894D400BD03481B820A20F4599978147853262576A48112CA53368466E365068206CBF3408519D4AE6B423C70F7F361643D3E43A2B7509601D767CD7C8E2358044F38EFBC367A1484141AAD09D095DB2BED3484D4607A250D5BA2157077F00E60C467A7E07D2885519A33CDBB87F7FA0AD85E7C0A3615CE7300DB38C409168D9689BC42C1C7EBFE5F71641A9B96BFBC20A61AD6BB0C1127B3D30CBD4017D5B8C3EB659FFB0321DCF18A6530E47020D8279D52D637CBA9AFF8E20ECEBF475192D267F79DB2177D262F3059F706CD071B1F4A671813D1BCC9554A0A7940D17C80E4D91AA0EACB8E285003028CCFAF6087AB9146D588C5176BFA8848872E48FD517E7A8071F0AEED2759568DC437EC2CCB8682F62F7DC028096F70C1835052B232136516786C5A20C92BFE0A6BDD7D6B241E820E8F7C1140605E97A950BCEF46A0E194868BEE9A81703843872521B0F1C4B9EBE85742E50859BCD5F8593B0D9D41BD71DE6C65D0BBA825867926D3AB99EC946A64EA9C350FCD7748A5E6A8125A81FEAE1F470A316621DCFFB62C513AFB2E8EEB09131E3E3A48A10747597EECD100233DEE264A51AEEF82047C41D60BC584BA79948C7A32DA4ACE66C245E1D65E9C4A2020092B98243C67B973DBA5A813F291B87EA0F9786B761DAEF52CFABFA7BC0762986E3B083B9AB7D83A1D2488DE2099BED8D242A5074D95BEC7DBDD58E122C2449DDA8D4D368172E19DF5F0F94ACB85BD8117DC68440F2DE0598BC29B11DA68B492C78B7D5A3BE421268730B9DEB4503E779891BBDAFF659486DB0AC172F95C6D4D375C749A70074B99546CB3A90494D1834910FB76AED0734E6806F9D2AABD525A960E65251C3F85EB5D5E197808BED7E084C0254F7A23F79F2E6071674110BF7F5C69BD9C4D63B04D19CEA5914C9269142FD35A1A96DE5F7C7DE0B038D79FFB0FC2707B6141466199FD4947F11957C5F740883F3614688D83D3804AEF22D181689898124495BF4271637A034333E1F7074AE304FD3B1BF792985B7B940BB379049350A28D7690C6EA8ACEC01B7588BAAEAB654475229E750BEDB3DD67AA180128C7EFE941ABDD182277ACD64DD9B30B3FE84EBA4CF445DD1074713B4C9154BF15F63EEA5819A00BB20ED68ED602ED7A78FDA2FD63E3815DA6B11087C7F4D3FE7831A9E16AD9F43AE3AD5FAB6326F775C071A9B2283000AB02BE3783AC6EE03956C29061F4D5129C9A74B257F50ACA0D1F08732D9D9826239299D5651187B5D416F67D1AB8787E3EF591F8448AC8044F38EFBC367A1484141AAD09D095DB2BED3484D4607A250D5BA2157077F00E60C467A7E07D2885519A33CDBB87F7F5EF65034F632732B9AAA7216F550D7EBC15FE21E9CE0BBA8A66BA362AF7BE082F3CDAA4F24C72003C15D8BCEF1B69DA21B3F89E8EA1FBC7E56E6C3014D71C3DCF2CCCB96A0F1B0ABDE43B16FE51A59B746F3885FA065408B0A3B90A15541835867003D82E97DDFBBEC8FAE2443B7CFB5925B511AA7700FA2AAEC99100631F99E070758A755AD5A1F6A6BC3B7D611C3403FDAB74DC3B4FF110BB1A07BE4FAFE64FDB2BC3ECF48A8B085D667CAB68FF8C74176B99BD70E06313167A41CF46FDB6AB2D8338E81EE13329709FE0E0FD39D038330F0D97050E7180AF462152B93FAC0D4177B6FF517D5F3B41686EF32D0CCB6E8DBD77A96E045F69DE10A26BAF7D9DAACB32140B43B84D9A2656E1A5FC93F6E1B3DC10996EB87E500C3DB33E806160271E7E3FDCDB869F4EFC2A0CBE0995EEA46EBCBC9EB6CD518DFFED4C4F6798E86573BE523677D2FF38EE6695FC202C82C816C87DCA3CCEB581A820280FA60B6BE25B13EB68F20C3CD2B05660DC964CEAE51AA25D14BDD78EC94FB0AAFA7101600915CDB367A96D167FAF3E6CF63A468455E6CB8C2B799046EA9314C8883E84B11B85BD8117DC68440F2DE0598BC29B11D10B9DE3DB372BB64186D0A1B75CACC110DCBE0A55FEE2FE3F062337DCD0A30255DD8AE42EE89C31929CF4BA4A940CEC24E3AA095FB9F06D43162DA6748FEF3634ACE74BF6A4C29C1C6C6DF8E060154C2B7EACB40A0C4F25E2867F513603803B92F11690103F26AF2759AA796EA71F7BEA34EA5CE158E9FB72B2D276E2172556542B6FAF5D8CB1BD68D0B6046CF14A6B1387BDEA6A8EDAB613C9B26C2040FD23E89FEB58C4058E64DEF62D6C5AD6DD12EC5ACDCF002CE0C7100C46BEC17386ED1792B43CBEC444A4A36126DE817C0B9AC82BFC561AD0D8D76DBC29CC4BD7DA40E703877B6E15D4E6AEEF3B522DA0D24808EBCD65FDAB5AA75ED1A27ABA1221F929BAFC8DFB40264A208A7E4D77EBB38E7B9555A6F3113D9FFF4B82D8AE4D271995F438AFF9AAF8F904C1EA0006A1BD44605839A28A3E471ABBDC5A8859BD954CCB036D5F7A891A07565300038EB7AA95B080C97300C5387E1B147F98AC92A13A78BED7E084C0254F7A23F79F2E6071674110BF7F5C69BD9C4D63B04D19CEA5914C9269142FD35A1A96DE5F7C7DE0B038D05B71E6F7BF06722BADBE59869D89156F0AA223D6CADA607854FB9B3C598CF9060A1A50FC67882224D4A28663504705581BC765325CA7303B61CA3D1D42F0D304A822BF6B9315331243FE915AFD04E542DEAFC7F454D2454BE7A667E006FB11C23C84A1F3207FBEBB0F73AB0B124B5B22E19C61E11B9518EB931F0F4DCEFA84B27A06F6A9A39B1B3690ABD60DDF35EFC411A5512A853FDCC7F8FE8AD6763BFE5C8793A6B4EEAE04ADF84157BC5F6D0E5B2D8338E81EE13329709FE0E0FD39D034BC60D82CE4E31A1ECF4A9F170BBA5F41AD233924F060A4F491A28B94F414E9ABB817C9E3945A3217406D0006C3CA764E47ECD33299122002E1A1E4C8B393884D79E6C735163FE8ED73AD7260A5610E62E623506BF04A222AD57C0447E1A0E755301D3C9807EB16D99A849D5D5201B162BC90B613FD4B64A8E9A7ECF060743BB9102EA47003538B1FA76841EA4001A0E3EDADECC58FEDD38787C647CB389E178C686B322CFBD19AFE300D85ACEACA04B470CCAA607C6845454B44D10A2FEEFA89E675758D1003BEC5BAEF40212C37FB44349B91D9EFD65355F2FC533097BF052A6FCF0FB77928B802E83304CEAD65C88B6D5CFEEEFE049AD386FBF1742C8AE28FD01C80742A9B79B6426AA6348AF6AA84101E7280F34CF68C666E79613147775584A7F08D595C7049EB89063C5968AD32A98D279600B7D7350598C455ECEEED1857510FD264C59011FA84029E10E69C965C59842BFFE85C18C99FC25249D7A4D5034BEB4B80C2508805FFE577A8630E9BC3E8B039216013F5FC955F8261E9C064B1CBC045A020B40327F68DAF028262629E71517BB326F193D362B82FBB1304A00A69503803B4D594A18F8F167534013FD29732079DC7509FB832090980F402F09D4ACE5B2B4954428084D87B9B339A2DF49D2B4DB06F58C510CD6ABBC9CD7ABDE57C3E7D5733318424A1E5AD31D6CD556FC78903D078902680377423CCC7B69372262BF4BF585085E03EFEF6B39594A1EC88C4B2A96C096A9502FEE38DA52232E623506BF04A222AD57C0447E1A0E756E5D1DC07ADB789182ACE4D04CA955A60F11B0E316231C2917E663AA33C24E18949B39A225B540AC6A5B06BCB3BE99F86557D8AD54FC30E33F26FED241FE8DB32B95DA30F8D08B5EEDE8472067BD1EE88DFA76D9A7BEF836F55C887F07799B83FF1CB11046008B09ED7F19AD1F65892B910A63CB953E139EBB41A089CF9F598F2856AC53D99AB9EE15D58649C118F508E02246CEAD6AF5FFA37FDC6CD1EF44AC4E361139EF13296D08CEB33A4ECD456D9E82EE78E860DED779AAF0E5E6428D72771C322044186E4AD54523409E8F42F16A6C57DD9278FFA504C4F60BBB888A731E8991DCDA68F03557C4A20434A5B6ED2A44E4319FCB443650C45A5035A0C172F4F4477AD8FF60579665F17F6C71E7EC20D1B696F1B41F465A488B70D50AEACD0934CE23067D26088BEC0D6CC2F446555673CAAE3A9FE369746C7AF47376C382281B5C5BEA962EDB1382116AC3D58791E18407126A38867EB61D528AC4CE78CB1EA7886CC93976C4482C59010CC08341752FD9972A1419E97440ADE8DDAA9B2F8044F38EFBC367A1484141AAD09D095D1DA099B13EE1F2ABE1F9ACE15D4B4F76DE39C77C5377E6A478AE076B0347931DBD9A0F5D6C7C1A9791BB689DEA9EA34D4B014BE8F8A5D922A57B075593D02801F7397A66C6F30A4BC0F050CD809035D542FB57CCF9581FB5859EF65F4D7A64B0DEF76A1856F30F06A6807808A55CD02F1E8D0611FD4AE993CD5682940AAD2F2E86EA7EF55FA5F4C017AD655ED2B613D92C70C95F6C180414FAA7DB35F704DC64DF82D4F95F5F9A98CCEAD39BA29200415D0E9D6B4880F9E7BAD391B312EA87B491E704AD70C1DBA19BA902953BBA772FB4AC7BD0EE66AEB696953A1417DD8BF733662A8B953BCCF40774A7C9EB9671D45507D9DF9F529DC4117D767B043F60DF82AE5D4C9C2CD67D34628478B19EACB8A673490375D113A4A2845D83CF73CBC3F9EFB7DDF23CA937693A19F40BD1E6B7";//encrypt(content, KEY);
+        String encrypt = "C98174A5A099183A55630002D064B9CFC3D00F2737DE942A45972B7D24E82EE8AE572CA7909FA24B00FE5BA71C8444648B2C8858803C07EA20DFDA51A65FB3291319F2A5EF330A2639E52F17BFD3F2106AE2B43D1409A56BE8FE5AC41DBDA003E25CE840E0374D3010E9BC9E943608FE5E10448B6F9BD4850DF138BDC643891861075E0048B92A7701A4C1C7294D99D2FA8DB4566068EF3B71EEFDC00F7E58EC64940FCD98D55D8381CF884FA88FB05545D45C2015621903DE5C491D59DE4589C0528AF25951D5F08C7DF68EE657CE0E62DD4FE5D58CE33B45BD68E728811DDDD57C8A628A90F39FACE4041355D5887DADFCB3F9E6166002F15C84BCDC0042C0F449B5CC841FAD99AD35979437A261246E6B5352D2696E370F2D2ACAA975061D16C97C3C83659ED5977DAD34241432E04FFAC8C292129B52B9A0B124963FBBC538D564D914CC842841092327B8324DF2C29FAD52BACF08A4A6E260F97F69943FB036D5F7A891A07565300038EB7AA95B0D3909C800A4268E78B9CECA1B38FD7A97220DBD6962398CCB365EDD881816A5312EEEE2B1F612AE170122FB50B1E702F544D0DF8FFC5C582F177FF2FC0227C3B129F913120BEBD830EEF1E3129825765119419C2CFE6120D33E3856C71431D20BF526425972E95E3FFA1440ED9D95EFA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F58C4FF69EEF7CF4040BEF32F7AE544D9215E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982F7FBEFD58D0150AE703C7B283C6C627B099F8434FAC672EF11B74EB1AC8CFBE4CD17E46FBB42D38FBB07539DB14236B14D368B218EB2356A1D4B221A97B1409726762B8FBC4CA18856602603C07E84A04B6589E52CC3F1A84153A16DD11B1F886BB93CF973EFC804BF702252990532B5110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F7444EF9324579A1265130391D1825B1B1AFA2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24CCB2AE97DE4AAC53E366C75AD7759D5E7AF9CE81F9EF614E6B89F798E037DB301B5E91B3D604F18127279CC5CA140CCEAAA6AA627E47DF7698D6EB0691843E87B5CB8DE5801D90305BFDBDE460D29D9D111BBB6023C915BFAC90F340374F880D50BF526425972E95E3FFA1440ED9D95EFA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F50665A9D723155118BC43D7B26AA279EA15E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982F7FBEFD58D0150AE703C7B283C6C627B4C11DC7E0F3264ED3EEB4D9ACA64921ACD17E46FBB42D38FBB07539DB14236B14865B63CCE76DB8434CD1312FCD79D9BD64B7A12D3A7D8AB1CD7800DE7BD8F8F4B6589E52CC3F1A84153A16DD11B1F886BB93CF973EFC804BF702252990532B5110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F74442C06155F433420F74327F6FC2FBE4FEF2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24CCB2AE97DE4AAC53E366C75AD7759D5E7AF9CE81F9EF614E6B89F798E037DB30127D82F1FFCE92EF7EAF020BAD693EFC6EAD7C773CA85B677A2DFE9C64176ABDA56558EB2E9DC3A46AF54689953095741007693F62578CD5D18F37F1682924079D946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E89BB2F5170981A8726B323D1FDFD5D518DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1423334666197E9CA6F2BB29C146369B2B9A9319F1CBE8E2AF074E02B27D26A7233D2522DF7C515117760E89872FFF2BB85DCCAA376F6F60E5ECC6DFCAEFC2D678DD946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E8F550F91A98A564A2249391179887E48ADD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1427BB1C8BE634AE3617DE5F5963610CDC6D365D388676C41654C0B391F1C7B41916B5AD4DD4458BDE6F3D7BBE4F81264574C25CF4CC227DD9B135D029CFB7FE921D946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E855219ACD15B747F24C61C8193B0F0584DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1423BA7139FCE9F5FE61285D0229C694334B1B03D94D5A14B446B6D76EE543B1762240BF9034FDC82527AF111B2BCF05F3B5491850E02BF17BDA3B2BE7DF5134D4FD946AFF82013F0F0DDD2F4975490B16FB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E8423340B61A8B58E6BEE3717D72A5AFB5DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AA7D2237A1D71FB348CC41CFACA5186370C821EFE003FA9C55A8929B7BBBAD1420EBCBEE7737D768557EC4A4D620AE6664DEF5377502CAE8A2646FECA7C3BEE699285F99E7A469CA8F32B352BC37FE0AACE411FD0548D6A86725A258715240B9880B08D081A14D7BD27D88323858A847B5F1DEC6D0EE1FAEA2F7AA1A0D676E859C2412392C1B696B17F01B2321156A53E2E19C61E11B9518EB931F0F4DCEFA84B0BF5126D89C6B35B5FEA289291F401AF7D3135B11CAF6719A68CA5F315914F52121B3EE8A978B83D18D80CA70ADA457F9DADEB0B12CC20715BE229AFE5D24E403CE81E02CB6F2459A71BC8D28D8ACE10AB6D408E0FC4F83B744ED436394521A1BF68210418490ABAB83CD2C83A615671B14A38800727FD1DD1CD5A942CC95D851E5561A5A1F80EFD3E77A3D27F79FA5C062347A40A3BD78FFD96B28A05DABF9A350BCB5E62A9C8D3B21305A19416124AC2DB0BFC82B193D94C0D37BAF99BF317C3D00F2737DE942A45972B7D24E82EE8AE572CA7909FA24B00FE5BA71C8444648B2C8858803C07EA20DFDA51A65FB3291319F2A5EF330A2639E52F17BFD3F210827A3141238FBA110C791AFBF02F70FCE25CE840E0374D3010E9BC9E943608FE5E10448B6F9BD4850DF138BDC643891861075E0048B92A7701A4C1C7294D99D2FA8DB4566068EF3B71EEFDC00F7E58EC1CAEC138588ADBD60E867CBC3E808E83CAAD6D9027F61535E8B3E1C46CA677935ABE91DFFD1D89D91690A55C688856377478B2652AA56E02241DEA44FA6100C767E7297B54CA3EA26F2857863D6CCD42BC866DCA8EB517DEC99C1CFA32256CB128AA994F09614E9E156AE54E51425C027F588EEED45D20576A0B2CCAF542F72AAE3612A74BF017EAA7B38B39C59228BEF90DB6A5A3DE21D0AEFDAB8611910E87EC4AA84D719728B8DBBA0EDD6D626282B84DCDD4E64BB977E1901586EAD6FBE47A2AB400D67A379D7B698D487E26F5FFBA20A00397E9BDF462C1D72DA0B4BFA08FCD63EA9D6711A3A4DDAB00541B89B95C1CC596C799179FA6637FCBF0B032A3EBDE66CBB84334E18AE9B1ADBCE819E050F8D15F244372DD72310EC040B0CE575484B87FD7B3C6F3148BF878DC352E5A6A266E333125591DDF521BFF710439106FE265D457515CA3D8A73DCD076D1B24667941601E0FB3D7EF71C4B1B5887FA7811BE5E522DECCE3D0B0C5DA1AF5111CAB6F0A0617CBA3A2C8FECE8A588A7F389A6EDE817376C3413C598BA96C85C0977288B37E73041ABCF4A78C5CC98E865787D7B76FB3E41111E5A6B5785AB7C2CD1E98A0E0A28C735B0DFF3423ACA06B8429D4BE30D39CF510E464F95D905BF7890F98D2DEB364CEECF2568DBCDBA3D31D0270CE4E36B928C8D519187D99C8B7C9E5E2258A260AA245333BAA17460D7149510A29CC114A5E8154B7D38F332932742A6D00719337269E42F2879069ED334589F6BB2512BA97C96547B555CAA63FE951E7DA0411D1346A86870EB7CD78D2557D5C1C7314B46C163DCCF68CC116DF070BF526425972E95E3FFA1440ED9D95EFA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F57C33B4584F622449F302B4B70B8CF68015E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982F7FBEFD58D0150AE703C7B283C6C627BDBFA73896A4F118E30B9DA9E25802B25683EDDC5FFA75986AE0C392DDB6C2D7341E8971EA97991DA8388CC3D23A7D671683CF4EAED2F86C7CCF4E0FEB8E9660D2288E02E11DD3F2FA84E5A776648C555B500F719AD346E950199150A4BA4034B2A26D4C28A225E97435F4BC162A599D2EADC8E66FCB90F0A35C25279098FBE8A796937FBFBE6443172022280C46B5AC58AB3834B27E320B4A1B44CB34F6BB0534FC1F34B58943411D2110FE020569B5561C4281EC63946F687B7E4AACDCD06466E6B5352D2696E370F2D2ACAA975061DB56B09A950EEA4646B9E6DED8598AD85E4692A2780E23E0CB8286EA2D1CA27A973652315E6E0D2CD79E31A9D56A95121787EC4FA388FA3A9C0239D517014F2F689EDF0D658B9FB853707F72500AF9EB1B74D9B185F99B3C58878626C0C7B614D3C31773EF413A63EB9357D4707D20EB5C520CE9E46B4217ABA9A6CA5BCEA0E50D26C5022024A10562B3362D5281B2585E8288651B10F948E30FE040D944D2963C7B068F04479A977E589ABBF8B013998AE572CA7909FA24B00FE5BA71C8444648B2C8858803C07EA20DFDA51A65FB3291319F2A5EF330A2639E52F17BFD3F2101200657ACB3C002B8AF8F32D6FDF521CE25CE840E0374D3010E9BC9E943608FE5E10448B6F9BD4850DF138BDC643891861075E0048B92A7701A4C1C7294D99D269C1D3075F059425FEEB1353502EBAA464940FCD98D55D8381CF884FA88FB055462AE64044FCE777E2BED4BD1C65949A4F0D0F78C9E54021F7CD9A43A7FE31981BF4D1F81C4EE19ADEA0423065D226AEB222D1CD82B0FB5FA1820D266FEF1F40ADFCB3F9E6166002F15C84BCDC0042C0400392221DCEC2B1104DBD748AC3713A110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F74446065D967EF87BE7782EC381B88402FBF2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24C4B007A44D65C3B6484EF4276193797F2E0FA501C8B9F59F4FE65397A2CE198A2A1AC0EAB48022A92CA9DB6FC3F8526D68A8F7B1873FEAB388D0517B209DF09FB7F3891CF3CF994FCC106249FEDAEB31BE999DE93FC2AE05A64939954F84D69A45B68BAABBDE231509418FBA2D741AF4DB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E8CCA26C4FAD35A5D2B8D6D74F4B96CD51DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9AED5169F5665D363C3F91B3542FB56DDD0C821EFE003FA9C55A8929B7BBBAD1428D8BAF9CF38EEB46E4711452A76ADD0F12788DFB7C3CC7F76FB35C1587447AA36258B84081BB02BB8283AB569BB0F9911A0F6BB8E7429F5D2380D14A7E5352C2F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A4C36E027128144C0F4924360E0060C146494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C63F3F48F443729C6C7A68C159963E7CE84F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD172E83AE23B968FE0642CD950A95097364DCAF90FEB56AFB82637CD8AE43BB317F93FC3A80A0082ADB565AF7F7C2983343779E740D504A4F146AA6733A9EE7BCF1BB05BB53C4FE577CD1D64BC1683562F02973467D34A6FF64CE0312F7247C3580FAD51C161F462D9185671E4EC64E9F3CCFD0197F6EE514EB4414A296EBA7C8F6B83A5EB76D5E12E44DD8B82B5C17F5E6BFF6DC822D78306D5917FED395A2B697149799031D903D0003CAA78345E5722B7D4D3CEDBB5B27BD309FDFF92C84BD656AB64C619B18D36C6898D63304D2C4D27B3D03B3565E73D31B28A6FA363387193EDC99AA34677F16534C7CF9315A9416228B843F15C434BF8645738E31ED1834DB83A15060BD948EE3F1339741DFC5431BAA6BD14F740764278695AE624F4CFAF731EC1FD6CB4A2479026FF6198BA11091A0F6BB8E7429F5D2380D14A7E5352C2F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A47BD4E133739543A97771F2D6CA8E7F38494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C63F3F48F443729C6C7A68C159963E7CE84F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD17288750C997C5703B1EFB0E75D25950E175AC2162D52810ADE59113415F8E58378355C71C21AE3AA9FDC7823185CF1CC175E793A3C0ECB6370447EC2ABA657937228AA994F09614E9E156AE54E51425C027F588EEED45D20576A0B2CCAF542F72AAE3612A74BF017EAA7B38B39C59228BEF90DB6A5A3DE21D0AEFDAB8611910E87A4AB4B181AD8A38511C8EEF05F29FECBB84DCDD4E64BB977E1901586EAD6FBE47A2AB400D67A379D7B698D487E26F5FFBA20A00397E9BDF462C1D72DA0B4BFA08FCD63EA9D6711A3A4DDAB00541B89B94503D978FD80ABCF26F6B504374BAD25B005DF960684565E6A5427E573578391885D3280B05B9599090149E6317F9432D13DDE3ED9902102F2FFE3C94D567C4EAD2A0F2E430CE27E235A369CC387A9C831469CD3C9FEC012D9A833666D1F63C3F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A42DD39396E76217B428752D800F984FE1494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C6337778CAEB131C389598AF7D7B5DE16969EDA6637B32450D80B1E9F6855250BC7D809CCB6563E9C35763AE4E61387B1460988B69A6A790623825FE192793F664F1E3EE05629763F07AAF5B6F5055B83828849CF2537F073F6DE3622BB58575EE0F966242AAFB02902D5178CAC8CBAF4BAB2A86CB882C61B2CA2C783CDA968B325E381F8278C1F181569DE96F770E559DDB4797E293218DBC08184F9C3ED711C1078796C0600594177EFC885B462AAE4E86FC70A124CE133350E71F82D05FC5755DD3BB8068CC5EEE2BFAC155D51604F4914A2EC9685A9DAC45BB05DA9EC56AC5D1AD233924F060A4F491A28B94F414E9A05997FE30D4E78FC3BB1BB8EB9C757F60C821EFE003FA9C55A8929B7BBBAD142B83A15060BD948EE3F1339741DFC543179D61397018564C276729E49A073A6B68E66D527A711A7D23BFBBDEBCF8B359265DE27C996056A3B0CBCCDAE814A09D56C21A7D1C5AF2FB411775BEE5999C8C76BB93CF973EFC804BF702252990532B5110EAC3237AAE50363DAD8A0351BF8DEEE1CAFB371C610489CA9CBF2ABA5ACB5BEEAF8CDC3C1CA5D7C190054996F7444B4FE4CF8CC0827CCA94F4FBD6D7DAE3D2085F213A78C2D019553C85E0258E7B99A6EDE817376C3413C598BA96C85C0976FD6CC2580DC610E0E7620B924E1D24C676CCAD34BA07F2A8CC7269091B0880A1C4DD1D72859973EA355FCF0C69CFC35B5E91B3D604F18127279CC5CA140CCEA2CED6D9E361A6D1BAFD004CCD73AB4CC4AC87C6AA3B95A4F9094ECA13FD62B9532DEC6CCDAA4B4A1B4145A7F1F7D5026E25AC10D80FF9DF13E92200A5820E81AA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F5F12BC511A61BDC2EF359DB1C40DBCD4115E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982B5FDCB0A1478E93F45D2894380FAE74E4C11DC7E0F3264ED3EEB4D9ACA64921AF488EF32D2AEA5C2A2C5F932177283364865B63CCE76DB8434CD1312FCD79D9B38C2F2F2A56E3DA94863EBBF0DB8F1E14B32FD1769F5BB6AEC7E6CFB6F79EBDAADFCB3F9E6166002F15C84BCDC0042C0F449B5CC841FAD99AD35979437A261246E6B5352D2696E370F2D2ACAA975061D16C97C3C83659ED5977DAD34241432E071EDC82B541E50E03CEB58E408F2780138D564D914CC842841092327B8324DF2C29FAD52BACF08A4A6E260F97F69943FB036D5F7A891A07565300038EB7AA95B0D3909C800A4268E78B9CECA1B38FD7A65DEAA78D5322124258F3FE4E53A838AC394E3AD688058CB0AC9878CEA2D22C780894D0ED271ADD459A2DFA61FC58119885D3280B05B9599090149E6317F9432738525708738AA5D73549006E13D274DD5A024B80C9A8C88BE34B5D3C904CD2531469CD3C9FEC012D9A833666D1F63C3F4F4477AD8FF60579665F17F6C71E7ECC400E4C07136EE6C77631831F262F7B3CC2119220BC5074EAE1A7FB28C0B7636B6777949610BF6064501952A87442C70FCEB8FE3EC1EE88C8DB03F85120682A414F77E0BFEB90932D14A66FDBA5CA529494D1834910FB76AED0734E6806F9D2AA1D0B2D877D78610B3EEF858F6B3C173FAFA969E462BE30CFEBFEAB5AF716C6337778CAEB131C389598AF7D7B5DE1696F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD172E83AE23B968FE0642CD950A95097364D2449FA15001C0CE7DCE7A0FA9E7772A88AC1981C20136F31DE56253F8A75A71A4DB579BDA3800300906146C1DEEF4309BA72CF7F892B19F4ABA6C3AE80B94CDED6644CD65AA50DB2C09254FECC638DAA900B378A3DBC1054BB6EE1DF9E3561261BF2A9E06CCDC32FBDB2088AD434DA17686D4DF13FD0E702D43364996BCAD3E734D3FB9AF200F8CE1965471482C68C9189257E55203829C072A208EA1C1BCCF3013F5FA4342B430ACEE1CC709884FCDD6CF93E2356C46A2EC523A8DC9326C864D745316B9F833B8FC8BEEDA1F1A82E03224E56174417171CA49CA7D562D2693E87169878DEB113FE81291DCA88ADDE0A068D36FFFC97C64727BF7C20AC3BFE1015A0E83DFDC2DC687995B858D502FBE69E4CCF772CA448F95DDAC51ECA4AF04A56A144BED037D48952102C9CD52626F21E9B87FF5704B7D58C0425B05C3AD5F86D55CDBA940ECAD5DB3725BE23AF87F4CE4EB9D177E52DE5B1F8074BA6D2BFD414A2EC9685A9DAC45BB05DA9EC56AC5D99284AA3EE0FA1CDD95E1C170908BBDFC895BE2D1EAF4FF1AF363A39D50D65DDC138E026DFA39C6A4128F82CBACA1FD4AE3612A74BF017EAA7B38B39C59228BE03AB3BB28D18A3D8363D454AE48A570FEB33E64D88C31EF93D38DD246939C5B4D5C20ED7198EFD84C36566EE1819D8719947DFD5354481DDD22093CB19AF64DD4F6A21B0B0B96195B54B02AC286EB3E9F488EF32D2AEA5C2A2C5F93217728336F1C735583671D6DC6B9F6A14E740275A581048A7189E1C116901F287D1428DD1E25AC10D80FF9DF13E92200A5820E81AA999B530120872A8AF6B145E671E64EE1E345A3E218D59FA4D6D172AC05A6AA7013F5FA4342B430ACEE1CC709884FCDD43BA99C630096CE13BCD3A02E63CF1F530BF62776462CE32E434A76C777F8EE715E0E4021A434AF9246E11F5668BBA13F23880CA4AB2A3CD358DCD9E65BF82C4ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982B5FDCB0A1478E93F45D2894380FAE74EDBFA73896A4F118E30B9DA9E25802B25683EDDC5FFA75986AE0C392DDB6C2D73A04C06E1032EF54FD5A869E4741950D7E3237B702AFDA97E3E7CB7465E02BF73F31F54CB87C33DC7BED9E8B5E4371E29E9BC95559C252E97E14249C4ED958A3BA37BA24031537AADC735AD2A0D0B37AB6223E455E70EC04185A72ADBCB3175AF0308EF6622120C162C376A8D195A0F4D2E4A1C95235BD12FB3DA9F1167B79358810C137CAFF25D337CFB3D8E87D782D88F4C38C501E0586A25052ED353B7413EEEA6EF66490C2C5D0C7D95918077987102440FC10CC38387D1F00D612431D424BCD1B5453C6A11DA06F5199D1B39EE31E92EE44039FFBE7E33666A64949BDC91B6B591E8C7ADB4B68ECB88ED3D434B4B16192105549AC0D932F7D59DA2C08CCFA55184C9D3922D58AFBF022108FD79C9DE67476D0B39A003C5BBF6FF7CECC2655B5C19BBCEF7AA4808F92AD9CC853AE82DD6819D55C48E47533AAE992A74D57ECA421244325ADCD92C9A5EA90ECAF8385A16CEE119CE7C133E751B843370E6F94934A21F3406FFC44B308D7EBA381757189D8CF34479B76A603A2FBFEBEADC51D63683E7C44D920948735A989B63370F372C1F325A36DF642297D893B4D6A82C4A8AF811E3BC768EFB3D2AC1AF09B14F610C1EF8F96360D813F3FFA1E38503974BE52CB2253AF0ABDD6D10BD525C3C068BED7E084C0254F7A23F79F2E6071674F329C125829B16D21DC7340CB3705358584A7F08D595C7049EB89063C5968AD3E779D6C6FE952C08478ECF4460D620F3A96DE5433558C040D7CDF40F37FF550FA4EBB76771D425F24139856C357244198EBE8335FF4C2EBA49E47D38005DA5EE9C650001B438ACB51AF4011AF3C5012BE642BE1BD1ABA81670ED5DE058098FF632242EFCCBDB39744F50B42203EB5832EE2C80F29DE9F0F0B3BB39AA1249D9F532B1B1401650908CAE115EE75073704C43BA99C630096CE13BCD3A02E63CF1F55611E37D81C8CFE424020DD1C0E9EA2B15E0E4021A434AF9246E11F5668BBA136D320CD5615D1EF162E619DA27E78AC6ED2B7ED049DA06D01D4EDB3849EC1ECD25920E510680945C5D4BA3C1B54FF982D597CD71B777D8A05AEF7CF8AAE6FF75CD2337128F490EE7DCD8EB190B3F09CD372262BF4BF585085E03EFEF6B39594A1EC88C4B2A96C096A9502FEE38DA52232E623506BF04A222AD57C0447E1A0E75BD68920E28F1C6CE5C44731440669EBACC891CF82E684077617F90B2DE861B2C8D8BAF9CF38EEB46E4711452A76ADD0F7D126CF8BA525886F924BDC3493A93B0114157468941387862AF5708D0E7D336E3ADB297AD2C3215E99DDB6950A165D458B97CEC5FDA34365A345AEF9A268C0470C4A9A3A30F0261F815A55E7EA8DF548D0A98EFC7670D06DCFAE04A3A28BED078796C0600594177EFC885B462AAE4E859F74CCEBF44755EA443E8A031276D7ADD3BB8068CC5EEE2BFAC155D51604F49A1F04632CA3AE792BBB47D777C538A551AD233924F060A4F491A28B94F414E9A224A9CE41B2B5CA8FBE7EFE995264CA00C821EFE003FA9C55A8929B7BBBAD14294709ED3177E1E2CCBBEB70ACA6EE21295C892D20BEF8C73CBE636F3DC859815E1608C12D69BBA86C6E98C8C28FCB549289374D82EC77B5212DC2C1975793807C137C160C9BCC3D3E43E52B6E7EF2222647616E9A14642870C7368F84E4BFA829EF3682F1567034F36F017042E7EBDDAEB2AC10D4BF2E28F9C173FB3F8AB89673697EC99BEDB699D85004B16C3CC3DB43A54116FA11F3AC5E66098D4B9DBD91593A411A90E42F9EF915C32F949E7C8632EC9982EEC90775E8C4E2CA608F9C233F90DB6A5A3DE21D0AEFDAB8611910E87493A5C25845CE23C019FE90DBFF9651FB84DCDD4E64BB977E1901586EAD6FBE49E61EC1F72DDDE7BBCEA0F791BF0698D99C6C77DF315827F840A5E4ECE76BBC78FCD63EA9D6711A3A4DDAB00541B89B9983F7A991E6B9FE7D0E13FBC21CE061881B863A6DF28C6E5748C0D714D6A4C68B7EACB40A0C4F25E2867F513603803B92F11690103F26AF2759AA796EA71F7BEA46FD87ED3B4F6255F03FA45F8ABCD3313907D72D40E537B24F5929631F8869E3DF58280C6EEA21FF1FDA4BD2BFCC1162CA7F7F9FB2AF54B845A762532F85C18513A6A1C2AC2F007771AF2FA6801BD10164E3E73978DA4A888B3393A9E8872F40B63409A5CA4C1B00F65C36BBC8670D53D17656858282B3FE1F53B7E1DEADED82F4F7CBBE9278C0B2FB1D0951CF757D5C2E9E51409215D51BD887EC7E9439480686D4DF13FD0E702D43364996BCAD3E70EC310FF704DA063B91FA3E8BA2D61D989257E55203829C072A208EA1C1BCCF332B1B1401650908CAE115EE75073704C6CF93E2356C46A2EC523A8DC9326C864157ADFE8C4AD14A25BEE6B9B0DAB2D41A8A85A9BECD23D3807C0747E0FEDF62A0337666023E1374685791D468C235A3FDB7C78600513BEBBB1C9AA6AB78D75411016CF70433B9AACDB1F0B6E994C7D6FC0A330300B54D04A42085715DED920EC82C9B141DA3480A432991DB4FD8AE683D1A465ACF31AABEF72F034C566EA1ECEF16A064ABB8AF8388A2E7ADA6703AB56E09A9FED5B61A8E3882110F0305EC3328D1A48ABA0910462209C9F5F045D3EF13E1AC30E64E6DE9851C19C8495B889236E31C5434731527B03682C3CB9C9B5C5D749CD57540E8D81174EBBE5108A2B25B85BD8117DC68440F2DE0598BC29B11DC6451374A59407BAAADB25CB7A633BCE69178178FD6D19D2CB1252C765FB98AACD8E41A7BE42BC8D5C2C9CAED4A5FCC96B104A8B95CDC0AB9F1C5E78C33E6B1A53318B5956D35C7A198264BDF8366F37ED02CC0B7F149A710AF1453D95BDA18DD3286E359126744155EF7284488D1E15E2EEB89B7AB737FEF55A7AA8C7617BAF7AAE21007A8B56D804CD0C55FF9438677F3646767D26B88057F0ECAB3A4888DD235B261D8BCF06D58710820BC15C1F377BF5A89E0662FD8CCEA34EB517324FC5D8163608E8594AB422A4A771C7B19E2F6F3AAA4AD3EFC1EAB1FEE8D2FAE1C2AE71245A5FD6DECA2834F3EC25930DDEE61AE312430101AA066CF4D1FD7B5EB54F8802216B622F03C8D9BD2BA4C10ADC0C62873096BAD7FC836C69D3C473024D47A1F04632CA3AE792BBB47D777C538A5599284AA3EE0FA1CDD95E1C170908BBDFB1C5FCD0BC0A2AA1DCE1F679361857F1C138E026DFA39C6A4128F82CBACA1FD42EC9982EEC90775E8C4E2CA608F9C23303AB3BB28D18A3D8363D454AE48A570F5DCAF85ADC979890DEDAF6EA4D68521BF0A90B47D1FDF0720DB23102407281BA9947DFD5354481DDD22093CB19AF64DD8044F38EFBC367A1484141AAD09D095D1DA099B13EE1F2ABE1F9ACE15D4B4F76DE39C77C5377E6A478AE076B0347931DC8697D8C7E1731BB476901F22C65F8A9519F9BB3BD46EAB29A0D8B486F7D7A69A1363B9F7CBD3BE062E50FA2585D05D126676F9BD2905625188F096C6C8B3B589A2A2913D939EC19969667C9BBC7262CEAB7F7301938CC48D88B3D26BDE4C049D68CD4BC063DA0E906059C15930EC921E1692B0782DC7A28D9ED5E1EA16E24DE937A15C6FF12A29D77EB358EB45DACD183A5EB76D5E12E44DD8B82B5C17F5E6BA51B25C17FBF2CD7DF0052FA46205CA749799031D903D0003CAA78345E5722B7529CE463E48C697DA8B7A213DEE3ECCFAB64C619B18D36C6898D63304D2C4D27656144A39644D9B5D9E733FC9E69D4AFEDC99AA34677F16534C7CF9315A9416228B843F15C434BF8645738E31ED1834D7E2FF275FBC649B7B76AD60147737BFD861CD43D1ADDF0EFE464CA368D0A06EABF39DA4A464A5AD7B27D73BC16511CE7484671EA1FF0DEFB5DFE7DB5810C79EB54EEDEC443910BF4FB6E1F62E20EF5A62EC9982EEC90775E8C4E2CA608F9C233F90DB6A5A3DE21D0AEFDAB8611910E87E72DCB1636B0D1CFC763C30C83597AA0B84DCDD4E64BB977E1901586EAD6FBE49E61EC1F72DDDE7BBCEA0F791BF0698D99C6C77DF315827F840A5E4ECE76BBC78FCD63EA9D6711A3A4DDAB00541B89B95C1CC596C799179FA6637FCBF0B032A3EBDE66CBB84334E18AE9B1ADBCE819E050F8D15F244372DD72310EC040B0CE5759C44CA33B60C226BEF767F19A489E957130400E6E133E80808B95C1CAF3D617DC254063F1E9E7FC383B51912B43DD777DA55B331DDAF6A1CDEA726C06F94CA7E1692B0782DC7A28D9ED5E1EA16E24DE937A15C6FF12A29D77EB358EB45DACD183A5EB76D5E12E44DD8B82B5C17F5E6B1B5B5AC2C2CC484F30508414C0A59BD249799031D903D0003CAA78345E5722B7529CE463E48C697DA8B7A213DEE3ECCFAB64C619B18D36C6898D63304D2C4D27E7DE5F12384C93A88305FA7AA843182BEDC99AA34677F16534C7CF9315A9416228B843F15C434BF8645738E31ED1834D3334666197E9CA6F2BB29C146369B2B95F8CE9279CBA1B00FC7C60910D3F705D8BC68DE5E0742D7237DF5B28E973AE83DB459BBE466508A12340C07EECB9F2703C79FB7A6BCFD9DD22BC3D7B8A1D7C8D213BA093F6F7FF51B1139897CB64B4675D01548CF14B99C739D285C220455EC2FCEB8FE3EC1EE88C8DB03F85120682A4A65D181E9CA1ED886DB3B7D0BE3DC37E494D1834910FB76AED0734E6806F9D2A52E227AB19C4A4D5F3556E29FEF75934FAFA969E462BE30CFEBFEAB5AF716C63FC302638CA658A95F76C85E77112E469F8D3AF7010332C6F6822B36D9618A4AABB0B090F5EC0B9439FDC7A4DBA6AD1728D5488F4B435D8A01965EFF3745AA9BDCC7CD78057B78338A619A529DA65A3B604D14A196F2BEF3706704BDAA2C931974B46AE8D83AFD65970027A855F5209E7EACD968BBD0D82FACE0880CF3893E59DC0FAA45A7A26D3AD9A5276345B213C0D7288B37E73041ABCF4A78C5CC98E86576861ECC4415FA321D1AE62F6F28B8ED61E98A0E0A28C735B0DFF3423ACA06B84ADFE4E4548C6E2F4D0BD07D6FE3EACC00F98D2DEB364CEECF2568DBCDBA3D31D0270CE4E36B928C8D519187D99C8B7C97E6E8E4B8260EAB8C1B0CD97C10F0BD9510A29CC114A5E8154B7D38F33293274325464C9DDFD30337852DB11DB2E3227C280C584A9B3015E41B5A9CD1DB0ED938C63479A6C98CF158F2FACD0DEE33C61A55E7FAB69F6B3AA5854CA44DA16950F7544B330DE2B2CC7EEFED304F21F65AD569EC01F813C3776367D8F29E6DB0ED61DBD5787371B3677A6E9143BFDBA88472ECED20797CD0A4C54007EBDB9680CE010472D2B678DBEEDBE75E45F2B42CEF5D68CD4BC063DA0E906059C15930EC92184BF45FE44A4089C7DCFAE713BF14026EC46F413A19023B7FCDBE298EF63778F83A5EB76D5E12E44DD8B82B5C17F5E6BD236BC8EF9E6B33AB4B08BB9CEFE1EC349799031D903D0003CAA78345E5722B740A7842DBA0F6ABA932E24A07EDC1327AB64C619B18D36C6898D63304D2C4D27E7DE5F12384C93A88305FA7AA843182B5D98FE06CD87CB4065A8CE8FCB1CCE890DA54F70DC14B3E0C62E269DAEEE23618E5483ABFA715D58B466061B4898ED051A0B2B460E667D292C555FADC4C34C9CEAD71BD1C420575641CAD746E7058614BC866DCA8EB517DEC99C1CFA32256CB11B1F60E1F3595328C4A0968BE6520ED467A4B0453490344A9AAA9725E8CC0F9D686D4DF13FD0E702D43364996BCAD3E7FC8A90FD5EB3BB2B7FE2C59139ACB49289257E55203829C072A208EA1C1BCCF31873C5F3D45414CE64C23E1F1200E0716CF93E2356C46A2EC523A8DC9326C864157ADFE8C4AD14A25BEE6B9B0DAB2D41D553B4C23F4930C84762E8AE89CADBC40337666023E1374685791D468C235A3FDB7C78600513BEBBB1C9AA6AB78D75411016CF70433B9AACDB1F0B6E994C7D6FC0A330300B54D04A42085715DED920EC26B08BC47F5066DAEABF12CC0C3B7DDB29CBE7E12ACC732AB20B8802D69544FE7F5E8D4F2800301346EB3EB7FE66F66CF4623D7138A27F54E39F5FECD520F0894E151AD2DB8ADF86C3D6203FCF7DB98A92833F9DCF7CF521AD5CE1F6BF7443DC6D8C62387AA03461DD678E146A046ABE";//encrypt(content, KEY);
         System.out.println("加密后：" + encrypt);
 //        String decrypt = decrypt(encrypt, KEY);
         String decrypt = decryptLinux(encrypt, KEY);
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
index c12dbd0e..3f86d801 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
@@ -123,3 +123,13 @@ spring.quartz.jdbc.schema=classpath:sql/quartz_mysql_2.3.0.sql
 org.quartz.plugin.jobInitializer.scanInterval = 300
 
 spring.mvc.static-path-pattern=/**
+
+#########################  royalcanin URL #############################
+royalcanin.couponconfig = http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/
+royalcanin.coupon = http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/
+royalcanin.memberaccount = http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/
+royalcanin.memberaddress = http://miniapp-test.royalcanin.com.cn:7080/crm/memberAddress/
+royalcanin.member = http://miniapp-test.royalcanin.com.cn:7080/crm/member/
+royalcanin.order = https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/
+royalcanin.goods = https://miniapp-test.royalcanin.com.cn/rcmini/h5/
+royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/
\ No newline at end of file
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml
index 173afd8e..6719deac 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml
+++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml
@@ -8,6 +8,9 @@
     <select id="findAllByCondition" resultMap="ProductSearchTagEntity">
         select tag_code,brand_name,tag_name from t_royalcanin_productsearchtag WHERE
         is_delete = 0
+        <if test="petType != null and petType != ''">
+            AND pet_type = #{petType}
+        </if>
         <if test="brandNameList != null and brandNameList.size > 0">
             AND brand_name in
             <foreach collection="brandNameList" open="(" close=")" separator="," item="brandName">
@@ -21,14 +24,21 @@
                  #{tagName}
             </foreach>
         </if>
-        <if test="tagStatus != null and tagStatus == 1">
-            or brand_name in ( '专区' ) and tag_name not like '%湿粮%'
+        <if test="tagStatus != null and tagStatus == 1 and tagNameList != null and tagNameList.size > 0">
+            OR brand_name in ( '专区' ) and tag_name not like '%湿粮%' AND pet_type = #{petType}
         </if>
-        <if test="tagStatus != null and tagStatus == 2">
-            or brand_name in ( '专区' ) and tag_name like '%湿粮%'
+        <if test="tagStatus != null and tagStatus == 2 and tagNameList != null and tagNameList.size > 0">
+            OR brand_name in ( '专区' ) and tag_name like '%湿粮%'  AND pet_type = #{petType}
         </if>
-        <if test="petType != null and petType != ''">
-            AND pet_type = #{petType}
+        <if test="tagStatus != null and tagStatus == 1 and tagNameList.size == 0">
+            AND brand_name in ( '专区' ) and tag_name not like '%湿粮%'
+        </if>
+        <if test="tagStatus != null and tagStatus == 2 and tagNameList.size == 0">
+            AND brand_name in ( '专区' ) and tag_name like '%湿粮%'
         </if>
     </select>
+
+    <delete id="deleteAllProductSearchTag">
+        delete from t_royalcanin_productsearchtag
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
index a135e225..0b4340f4 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
@@ -23,7 +23,7 @@ spring.servlet.multipart.max-request-size=30MB
 file-upload-service.path=/home/upload/smart-admin-file
 
 ######################### database #########################
-spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-pro?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&allowMultiQueries=true
 spring.datasource.username=azureuser@rc-hub-mysql
 spring.datasource.password=(G=q0D5ez2Fz
 spring.datasource.initial-size=2
@@ -118,3 +118,14 @@ spring.quartz.job-store-type=jdbc
 #ALWAYS,EMBEDDED,NEVER
 spring.quartz.jdbc.initialize-schema=NEVER
 spring.quartz.jdbc.schema=classpath:sql/quartz_mysql_2.3.0.sql
+
+
+#########################  royalcanin URL #############################
+royalcanin.couponconfig = http://crm.royalcanin.com.cn:8080/crm/couponConfig/
+royalcanin.coupon = http://crm.royalcanin.com.cn:8080/crm/coupon/
+royalcanin.memberaccount = http://crm.royalcanin.com.cn:8080/crm/memberAccount/
+royalcanin.memberaddress = http://crm.royalcanin.com.cn:8080/crm/memberAddress/
+royalcanin.member = http://crm.royalcanin.com.cn:8080/crm/member/
+royalcanin.order = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/
+royalcanin.goods = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/
+royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/
\ No newline at end of file
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
index 8596a19d..9360d376 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
+++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
@@ -14,8 +14,8 @@
 
 -- 导出 smart-admin-dev 的数据库结构
 DROP DATABASE IF EXISTS `smart-admin-dev`;
-CREATE DATABASE IF NOT EXISTS `smart-admin-dev` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
-USE `smart-admin-dev`;
+CREATE DATABASE IF NOT EXISTS `smart-admin-pro` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
+USE `smart-admin-pro`;
 
 -- 导出  表 smart-admin-dev.t_department 结构
 DROP TABLE IF EXISTS `t_department`;
@@ -1602,7 +1602,7 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_operate_log` (
   `code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
   `msg` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+)
 
 
 CREATE TABLE `t_good_orders` (
@@ -1720,8 +1720,8 @@ INSERT INTO `t_royalcanin_productsearchtag` (`id`, `brand_code`, `brand_name`, `
 (1032, '16518816', '品种', '0', '布偶', '1017', '1017014', 0, '2022-01-19 16:41:55'),
 (1033, '16518816', '品种', '0', '暹罗', '1017', '1017015', 0, '2022-01-19 16:41:55'),
 (1034, '16518816', '品种', '0', '缅因', '1017', '1017016', 0, '2022-01-19 16:41:55'),
-(1035, '16518816，555131355', '年龄', '1', '幼年', '1018', '1018001', 0, '2022-01-19 16:41:55'),
-(1036, '16518816，555131355', '年龄', '1', '成年', '1018', '1018002', 0, '2022-01-19 16:41:55'),
+(1035, '16518816', '年龄', '1', '幼年', '1018', '1018001', 0, '2022-01-19 16:41:55'),
+(1036, '16518816', '年龄', '1', '成年', '1018', '1018002', 0, '2022-01-19 16:41:55'),
 (1037, '16518816', '年龄', '1', '老年', '1018', '1018003', 0, '2022-01-19 16:41:55'),
 (1038, '16518816', '年龄', '0', '4-12月龄', '1018', '1018004', 0, '2022-01-19 16:41:55'),
 (1039, '16518816', '年龄', '0', '1-7岁', '1018', '1018005', 0, '2022-01-19 16:41:55'),