!213 Leung

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

rc-busness/pages/myorder/usertion.vue

@@ -333,6 +333,7 @@ export default {
     //订单立即支付
     async getwei(user) {
 	  let data = await this.repayOrde(this.orderNumber);
+	  let loginedUser = this.$store.state.userInfo;
 	  if(data.code==1) {
 		  let userPayData = {
 		    userprice: this.usersalesAmount,
@@ -345,6 +346,7 @@ export default {
 		      "order_repay",
 		      {
 		  		"status":"success",
+				"member_id": loginedUser.data.id
 		      }
 		  ])
 		  this.$router.push({
@@ -361,6 +363,7 @@ export default {
 		      "order_repay",
 		      {
 		  		"status":"fail - " + this.orderNumber,
+				"member_id": loginedUser.data.id
 		      }
 		  ])
 		  this.$message({

rc-busness/pages/personal/useraddress.vue

@@ -153,6 +153,7 @@ import MyFooter from '~/components/rc-footer.vue';
 import tabs from "~/components/tabs.vue";
 import util from "@/ajax/util";
 import { customerorders, userindent, canceldanhao, repayOrde } from "../../ajax/getData";
+import { mapMutations } from "vuex";
 export default {
   data() {
     return {
@@ -288,7 +289,8 @@ export default {
   },
 
   mounted() {
-    let user = JSON.parse(localStorage.getItem("userInfo"));
+	this.checkIsLogin();
+    let user = this.$store.state.userInfo;
     this.userdata = user.data.mobile;
     let stype = this.$route.query.stype;
     this.userstype=this.$route.query.stype;
@@ -308,6 +310,7 @@ export default {
 	tabs
   },
   methods: {
+	...mapMutations(["changemessage","checkIsLogin"]),
     async indet(mobile, stype) {
 		let data = await userindent(mobile,undefined,1,100);
 		this.activeIndex = stype;
@@ -478,6 +481,7 @@ export default {
 	userfind(item) {
 		this.paytypeWarning = this.util.checkPaytypeValidated(item.paytype);
 		this.showPaytypeWarning = !this.paytypeWarning.result;
+		let user = this.$store.state.userInfo;
 		if(this.paytypeWarning.result) {
 			if(item.status==0){
 				_hmt.push([
@@ -485,6 +489,7 @@ export default {
 				    "order_repay",
 				    {
 						"status":"success",
+						"member_id": user.data.id
 				    }
 				])
 				this.getwei(item);
@@ -503,6 +508,7 @@ export default {
 			    "order_repay",
 			    {
 					"status":"fail",
+					"member_id": user.data.id
 			    }
 			])
 		}

rc-busness/pages/productdetails/producted.vue

@@ -492,6 +492,11 @@ export default {
     },
     //领取优惠券
     usergetconf(item) {
+		let memberId = '';
+		if (this.usermessage.data !== "" || this.usermessage.data !== undefined) {
+			this.getconf(this.usermessage.data.id, item.couponId);
+			memberId = this.usermessage.data.id;
+		}
 		_hmt.push([
 		    "_trackCustomEvent",
 		    "get_coupon",
@@ -501,11 +506,9 @@ export default {
 				"product_name": this.curItem.productName,
 				"product_quantity" : this.sales_num,
 				"product_amount" : this.sales_num*this.curItem.ecPrice,
+				"member_id" : memberId
 		    }
 		])
-		if (this.usermessage.data !== "" || this.usermessage.data !== undefined) {
-			this.getconf(this.usermessage.data.id, item.couponId);
-		}
     },
 
     //获取用户领取的优惠券
@@ -723,6 +726,7 @@ export default {
 		        "product_name": this.curItem.productName,
 				"product_quantity" : this.sales_num,
 				"product_amount" : this.sales_num*this.curItem.ecPrice,
+				'member_id': user.data.id
 		      }
 		  ])
         }

rc-busness/pages/userlogin/login.vue

@@ -407,6 +407,7 @@ export default {
 			this.checkIsLogin();
 			let returnMessage='';
 			if(data.type==1) {
+				debugger;
 				if(data.data.memberName===undefined){
 					returnMessage = '欢迎回来';
 				}
@@ -416,7 +417,9 @@ export default {
 				_hmt.push([
 				    "_trackCustomEvent",
 				    "login",
-				    {}
+				    {
+						'member_id': data.data.id
+					}
 				])
 			} else if(data.type==2) {
 				returnMessage = '恭喜注册成功';