!201 Leung

Merge pull request !201 from Admin/sit-Leung-v3

rc-busness/ajax/getData.js

@@ -425,10 +425,13 @@ export const dogquery = (productCode,type) => {
 
 //查询商品信息
 export const productQuery = (productCode) => {
-  var data = {
+	let url = 'product/query';
-    productCode:productCode
+	if(productCode) {
-  }
+		url += '?productCode='+encodeURI(productCode);
-  return fetch('product/query', data, 'POST' )
+	}
+	var data = {
+	}
+	return fetch(url, data, 'POST' )
 }
 
 

rc-busness/ajax/util.js

@@ -75,6 +75,21 @@ let util = {
 			return mapping[paytype];
 		return '';
 	},
+	getAgeMapping(tagAgeStr){
+		let mapping = {
+			"1":'<4月龄,离乳期', //奶糕
+			"2":'4-12月龄,幼年',//幼年
+			"3":'1-7岁,成年',//成年
+			"4":'>7岁,老年',//老年
+		};
+		for(let id in mapping) {
+			let item = mapping[id];
+			if(item.indexOf(tagAgeStr)>-1) {
+				return id;
+			}
+		}
+		return false;
+	},
 	/*
 	couponDisplayFilter(couponList,filterObj,returnRequirement){
 		//Dictionary : filterObj {}

rc-busness/pages/index.vue

@@ -36,15 +36,15 @@
 		    	</a>
         </swiper-slide>
 
-        <!-- <swiper-slide>
+        <swiper-slide>
-				<a href="/" target="_blank">
+			<a href="#">
-					<picture>
+				<picture>
-						<source media="(max-width: 768px)" srcset="/images/banner/four.jpg">
+					<source media="(max-width: 768px)" srcset="/images/banner/38.jpg">
-						<source media="(min-width: 769px)" srcset="/images/banner/pc-banner4.png">
+					<source media="(min-width: 769px)" srcset="/images/banner/pc-38.png">
-						<img src="/images/banner/four.jpg">
+					<img src="/images/banner/four.jpg">
-					</picture>
+				</picture>
-				</a>
+			</a>
-			</swiper-slide> -->
+		</swiper-slide>
       </swiper>
       <div
         id="homeBannerSwiperPagnation"

rc-busness/pages/personal/discount.vue

@@ -48,13 +48,14 @@
                 </i>
                 <div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
                     <strong>有效期</strong>
-                  <span>{{item.validFrom}}至</span>
+                  <span>{{item.validFrom}}</span>
+				  <span>至</span>
                   <em>{{item.validTo}}</em>
                 </div>
-                   <nuxt-link :to="`/productdetails/productlist`" v-if="activeIndex==0">
+                <nuxt-link :to="`/productdetails/productlist`" v-if="item.canUse">
-                <div class="ts-standard-btn">
+					<div class="ts-standard-btn">
-                        立即使用
+						立即使用
-                </div>
+					</div>
                 </nuxt-link>
               </div>
 
@@ -153,6 +154,7 @@ export default {
 				}
 			});
 			this.fullCouponList = list;
+			this.selectGoods('',UNUSE);
 		}
     },
 	selectGoods(item, index) {
@@ -197,6 +199,7 @@ export default {
 							valDateToTime = new Date(coupon.fValidTo).getTime();
 						}
 						if(curTime > valDateToTime && coupon.status==0) {
+							coupon.canUse=false;
 							this.newlist.push(coupon);
 						}
 					}
@@ -209,11 +212,13 @@ export default {
 						valDateToTime = new Date(coupon.fValidTo).getTime();
 					}
 					if(valDateFromTime && valDateToTime && curTime >= valDateFromTime && curTime <= valDateToTime && coupon.status == 0) {
+						coupon.canUse=true;
 						this.newlist.push(coupon);
 					}
 					break;
 				case USED:
 					if(coupon.status == 1) {
+						coupon.canUse=false;
 						this.newlist.push(coupon);
 					}
 					break;
@@ -243,7 +248,6 @@ export default {
 		this.$router.push({ path: "/userlogin/login"})
 	}
 	this.userdraw(this.usermessage.data.mobile);
-	this.selectGoods('',0);
   },
   components: {
     Myheader,

rc-busness/pages/personal/settlement.vue

@@ -424,7 +424,7 @@ export default {
 				if(myCoupon.udf2!='H5') {
 					dateChecked=false;
 				}
-				
+				//TODO add more checking
 				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);
@@ -635,21 +635,25 @@ export default {
     this.goldmedal = JSON.parse(this.$route.query.list);
     this.getAddressList();
 	this.checkIsLogin();
+	let user = this.$store.state.userInfo;
+	let memberId = '';
+	if(user)
+		memberId = user.data.id;
 	this.finalAmount = this.sumPrice;
 	this.goldmedal.forEach((item) => {
 		_hmt.push([
 		    "_trackCustomEvent",
 		    "placing_order",
 		    {
-				//TODO order id add here
+				"member_id": memberId,
-				"product_id":item.productCode,
+				"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);
 	}

rc-busness/pages/personal/userpay.vue

@@ -107,7 +107,7 @@
 import Myheader from "~/components/header.vue";
 import tabs from "@/components/tabs.vue";
 import vueQr from 'vue-qr'
-
+import { mapMutations } from "vuex";
 
 import { generateOrderAlipay, updateOrderWX, monitorOrderNotify,repayOrde } from "../../ajax/getData";
 import util from "@/ajax/util";
@@ -120,7 +120,7 @@ export default {
 			paymentTimer:undefined,
 			isSucess: false,
 			h5PayUrl:"",
-			dialogSuccess: true,
+			dialogSuccess: false,
 			paytype: "微信",
 			userpaystype: [
 			{
@@ -158,6 +158,7 @@ export default {
 	this.defaultHandlePayment();
   },
   methods: {
+	...mapMutations(["checkIsLogin"]),
 	detectQrcodeDisplay(){
 		let payType = this.util.pickPaytype();
 		switch(payType) {
@@ -192,10 +193,16 @@ export default {
 				//TODO raise WX jsapi pay
 				break;
 		}
+		this.checkIsLogin();
+		let user = this.$store.state.userInfo;
+		let memberId = '';
+		if(user)
+			memberId = user.data.id;
 		_hmt.push([
 		    "_trackCustomEvent",
 		    "payment",
 		    {
+				"member_id": memberId,
 				"payType" : payType,
 				"product_amount" : this.userPayData.userprice,
 		    }
@@ -268,10 +275,15 @@ export default {
       if (res.success) {
         this.qrtext = '成功加入群的二维码';
         this.dialogSuccess = true;
+		let user = this.$store.state.userInfo;
+		let memberId = '';
+		if(user)
+			memberId = user.data.id;
 		_hmt.push([
 		    "_trackCustomEvent",
 		    "payment_finished",
 		    {
+				"member_id" : memberId,
 				"payType" : 'native',
 				"product_amount" : this.userPayData.userprice,
 		    }

rc-busness/pages/productdetails/producted.vue

@@ -336,7 +336,10 @@ export default {
 			productAttachmentList = [insertTmpObj];
 			userbuy = false;
 		} else {
-			mainProduct = await productQuery(mainProductCode);
+			if(mainProductCode && mainProductCode.length>2) {
+				mainProduct = await productQuery(mainProductCode);
+				mainProduct = mainProduct.pop();
+			}
 			let stopLeftAllotmentChecking = false;
 			let stopIndex = 0;
 			for(let singleCode of productCode) {
@@ -597,12 +600,18 @@ export default {
 			if(item.packageTypeIds!='1') {
 				dateChecked=false;
 			}
-			if(this.mainProduct && this.mainProduct.petType) {
+			if(this.mainProduct && this.mainProduct.petType && item.petCategoryIds) {
 				if(this.mainProduct.petType===0 && item.petCategoryIds!='1')
 					dateChecked=false;
 				if(this.mainProduct.petType===1 && item.petCategoryIds!='2')
 					dateChecked=false;
 			}
+			if(this.mainProduct && this.mainProduct.tagUsedAge && item.petAgeTypeIds) {
+				let productToCouponAgeId = this.util.getAgeMapping(this.mainProduct.tagUsedAge);
+				if(item.petAgeTypeIds!=productToCouponAgeId)
+					dateChecked=false;
+			}
+			
 			if(dateChecked && item.activityId!=10) {
 				if(!item.productCodes) {
 					menualist.push(item);