有效期
- {{item.validFrom}}至
+ {{item.validFrom}}
+ 至
{{item.validTo}}
-
-
- 立即使用
-
+
+
+ 立即使用
+
@@ -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,
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 38508112..6b8d8f0f 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/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
- "product_id":item.productCode,
+ "member_id": memberId,
+ "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);
}
diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue
index 2df454ca..ee5c9aec 100644
--- a/rc-busness/pages/personal/userpay.vue
+++ b/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,
}
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index 2ae661d9..2cd059b7 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/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);
diff --git a/rc-busness/static/images/banner/38.jpg b/rc-busness/static/images/banner/38.jpg
new file mode 100644
index 00000000..1ecbe2de
Binary files /dev/null and b/rc-busness/static/images/banner/38.jpg differ
diff --git a/rc-busness/static/images/banner/pc-38.png b/rc-busness/static/images/banner/pc-38.png
new file mode 100644
index 00000000..97f220f9
Binary files /dev/null and b/rc-busness/static/images/banner/pc-38.png differ
+