diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js
index 59b0c253..bba6ac28 100644
--- a/rc-busness/ajax/getData.js
+++ b/rc-busness/ajax/getData.js
@@ -425,10 +425,13 @@ export const dogquery = (productCode,type) => {
//查询商品信息
export const productQuery = (productCode) => {
- var data = {
- productCode:productCode
- }
- return fetch('product/query', data, 'POST' )
+ let url = 'product/query';
+ if(productCode) {
+ url += '?productCode='+encodeURI(productCode);
+ }
+ var data = {
+ }
+ return fetch(url, data, 'POST' )
}
diff --git a/rc-busness/ajax/util.js b/rc-busness/ajax/util.js
index ef5cbb35..c94e65de 100644
--- a/rc-busness/ajax/util.js
+++ b/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 {}
diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue
index 3da63e74..75ec23eb 100644
--- a/rc-busness/pages/index.vue
+++ b/rc-busness/pages/index.vue
@@ -36,15 +36,15 @@
-
+
+
+
+
+
+
+
+
+
-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 85d85b4c..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";
@@ -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/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