Merge branch 'sit-Carl' into sit-Leung

# Conflicts:
#	rc-busness/pages/index.vue
#	rc-busness/pages/productdetails/producted.vue

rc-busness/assets/css/global.less

@@ -205,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;

rc-busness/config/env-data.js

@@ -106,6 +106,32 @@ let devData={
 			      },
 			    ],
 			  },
+			],
+			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",
+				    },
+				  ],
+				},
 			]
 		};
 
@@ -218,6 +244,32 @@ let prdData={
 			  },
 			],
 		  },
+		],
+		amature:[
+			{
+			  title: "中型幼犬离乳期全价奶糕",
+			  productimage: "/images/dogfoot.png",
+			  detail: "中心犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长",
+			  ecPrice: "¥263",
+			  productCode:'17220400',
+			  productList: [
+			    {
+			      productCode: "17220400,17221000,1722040002,17220400F03",
+			    },
+			  ],
+			},
+			{
+			  title: "皇家离乳期幼猫全价奶糕",
+			  productimage: "/images/catfoot.png",
+			  detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量",
+			  ecPrice: "¥189",
+			  productCode:'20010200',
+			  productList: [
+			    {
+			      productCode: "20010200,20011000,20010040",
+			    },
+			  ],
+			},
 		]
 	};
 //Production data end

rc-busness/pages/index.vue

@@ -1032,7 +1032,7 @@
 	        </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>
@@ -1259,6 +1259,7 @@ export default {
       ],
       catlistvideo: [
         
+
       ],
 
       doglistvideo: [
@@ -1313,7 +1314,7 @@ export default {
         //       console.log("1");
         //     } 
 			 if (this.realIndex == 2) {
-				console.log(vm.userdata.data.id)
+
 			// 	setTimeout(() => {
 			//   var option = {
             //     customer: {
@@ -1399,7 +1400,7 @@ export default {
   watch: {},
   mounted() {
     this.checkIsLogin();
-    this.userdata = this.$store.state.userInfo;
+
     const that = this;
 
     this.ifAdoid();
@@ -1422,29 +1423,10 @@ export default {
     window.removeEventListener("scroll", this.scrollToTop);
   },
   methods: {
+	...mapMutations(["checkIsLogin"]),
 	diaoqi(){
-	setTimeout(() => {
-		var option = {
-			customer: {
-				id: "",
-				name: "",
-				email: "", 
-				mobile: "",
-				memberId: vm.userdata.data.id,
-			},
-		};
-		dis_livchat(option);
-		_hmt.push([
-		    "_trackCustomEvent",
-		    "sol_consult",
-		    {
-				"page":this.$route.path,
-		        "shop_head_banner": 1,
-		    }
-		])
-		}, 500);
+		this.$refs['fixRightComponent'].lianxi({title:'营养专家'});
 	},
-    ...mapMutations(["checkIsLogin"]),
     playMobileVideo(item) {
       let videoPath = item.video;
       let player = this.$refs["mobile-video-player"];

rc-busness/pages/resentation/resentation.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="rc-padding-y--lg">
+    <Myheader></Myheader>
+    <div class="rc-top"></div>
+    <div class="ts-banner-swiper-container">
+		<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>
+      </nuxt-link>
+    </div>
+  </div>
+</template>
+
+<script>
+import Myheader from "~/components/header.vue";
+import envData from "~/config/env-data.js";
+export default {
+  data() {
+    return {
+		envData,
+		dataList:{amature:[]}
+	};
+  },
+  components: {
+    Myheader,
+  },
+  mounted(){
+	  let env=process.env.NODE_ENV;
+	  this.dataList=this.envData[env];
+  },
+  methods:{
+      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: isRxGoods,
+            mainProductCode: mainProductCode,
+            productCode: productCode.join(","),
+          },
+        });
+      },
+  }
+};
+</script>
+
+<style lang="less" scoped >
+.ts-banner-swiper-container {
+    img {
+      width: 100%;
+      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>