!154 2022-2-10 Leung

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

rc-busness/components/fixed-right.vue

@@ -56,22 +56,25 @@ export default {
 	methods:{
 		...mapMutations(["checkIsLogin"]),
 		lianxi(item,index){
+			this.checkIsLogin();
+			let user = this.$store.state.userInfo;
+			let curMemberId = (user?user.data.id:'');
 			if(item.title=='在线客服'){
-				this.customerServerStop = true;
+				//this.customerServerStop = true;
-				/* Stop until 2022-2-10
+				/* Stop until 2022-2-10 */
 				var option = {
-					customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
+					customer: {id: '', name: '', email: '', mobile: '', memberId: curMemberId}
 				}
 				dis_livchat(option);
 				_hmt.push([
 				    "_trackCustomEvent",
-				    "cs_consult",
+				    "live_chat",
 				    {
-						"page_name_":this.$route.path,
+						"type":"cs",
-				        "shop_right_btn": 1,
+				        "member_id": curMemberId,
 				    }
 				])
-				*/
+				
 			}
 			if(item.title=='购物车'){
 				if(this.loginornot){
@@ -85,22 +88,20 @@ export default {
 				}
 			}
 			if(item.title=='营养专家'){
-				this.customerServerStop = true;
+				//this.customerServerStop = true;
-				/* Stop until 2022-2-10
+				/* Stop until 2022-2-10*/
 				var option = {
-					customer: {id: '', name: '', email: '', mobile: '', memberId: '999999'}
+					customer: {id: '', name: '', email: '', mobile: '', memberId: curMemberId}
 				}
 				dis_livchat(option);
-				console.log(this.$route.path);
 				_hmt.push([
 				    "_trackCustomEvent",
-				    "sol_consult",
+				    "live_chat",
 				    {
-						"page_name_":this.$route.path,
+						"type":"sol",
-				        "shop_right_btn": 1,
+				        "member_id": curMemberId,
 				    }
 				])
-				*/
 			}
 		},
 		toTop() {

rc-busness/pages/index.vue

@@ -1308,44 +1308,8 @@ export default {
         navigation: {
           nextEl: ".swiper-button-next",
           prevEl: ".swiper-button-prev",
-        },
-        on: {
-          slideChange(Swiper) {1
-            // console.log(this.realIndex);
-          },
-          tap(event) {
-            console.log(this.realIndex);
-          },
-          click(event) {
-            console.log(this.realIndex);
-            console.log(this.realIndex);
-			vm.indexacindex=this.realIndex;
-        //     if (this.realIndex == 0) {
-        //       console.log("0");
-        // // window.location.href ='https://blog.csdn.net/smallnetvisitor/article/details/84817905';
-        //     } else if (this.realIndex == 1) {
-		// 		//   window.location.href ='https://blog.csdn.net/smallnetvisitor/article/details/84817905';
-        //       console.log("1");
-        //     } 
-			 if (this.realIndex == 2) {
-
-			// 	setTimeout(() => {
-			//   var option = {
-            //     customer: {
-            //       id: "",
-            //       name: "",
-            //       email: "", 
-            //       mobile: "",
-            //       memberId: vm.userdata.data.id,
-            //     },
-            //   };
-            //   dis_livchat(option);
-			// 	}, 500);
-        
         }
       },
-        },
-      },
       catStarProductswiperOption: {
         //loop: true,
         slidesPerView: "auto",
@@ -1496,7 +1460,7 @@ export default {
           bIsWM
         )
       ) {
-        console.log("当前是电脑打开");
+        //console.log("当前是电脑打开");
         this.stypechange = false;
         //console.log(this.usertitle)
         this.usermargin = {
@@ -1512,7 +1476,7 @@ export default {
         this.dogshow = false;
         this.showingBanners = this.banners.pc;
       } else {
-        console.log("当前是手机打开");
+        //console.log("当前是手机打开");
         this.showingBanners = this.banners.mobile;
         this.stypechange = true;
         this.onemao = true;

rc-busness/pages/myorder/usertion.vue

@@ -205,7 +205,6 @@ export default {
       logisticsNumber: "",
       customer: "", //联系客服或者取消订单
       payorsucess: "", //立即支付或者再次购买，
-      addressstype: null,
       addressUserName: "",
       logisticsCompany: "", //物流公司
       orderstatus: "",
@@ -327,6 +326,7 @@ export default {
 			this.addressPhoneNumber = this.goldmedal[i].addressPhoneNumber;
 			this.paytype = this.goldmedal[i].paytype;
 			this.information.paytypeText = this.util.getTextByPaytype(this.paytype);
+			this.updateButtonByOrderStatus(this.goldmedal[i].status);
         }
       }
     },
@@ -391,6 +391,33 @@ export default {
 
       // console.log(this.list);
     },
+	updateButtonByOrderStatus(status){
+		if (status == 2) {
+			this.orderstatus = "您的订单已完成";
+			this.isshow = false;
+			this.userisdelivery = "待发货";
+			this.customer = "联系客服申请售后";
+			this.payorsucess = "再次购买";
+		} else if (status == 0) {
+			this.orderstatus = "您的订单还未付款，请尽快付款！";
+			this.isshow = false;
+			this.userisdelivery = "待付款";
+			this.customer = "取消订单";
+			this.payorsucess = "立即支付";
+		} else if (status == 1) {
+			this.orderstatus = "您的订单已发出，请耐心等候。";
+			this.isshow = true;
+			this.userisdelivery = "待收货";
+			this.customer = "联系客服申请售后";
+			this.payorsucess = "再次购买";
+		} else if (status == 3) {
+			this.orderstatus = "您的订单已取消！";
+			this.isshow = false;
+			this.userisdelivery = "已取消";
+			this.customer = "联系客服申请售后";
+			this.payorsucess = "再次购买";
+		}
+	}
   },
   mounted() {
     this.checkIsLogin();
@@ -399,35 +426,8 @@ export default {
     this.userid = this.usermessage.data.id;
     this.userphone = this.usermessage.data.mobile;
     this.editaddress(this.userid);
-    this.addressstype = this.$route.query.stype;
-
     this.orderNumber = this.$route.query.orderNumber;
     this.orderquantity(this.orderNumber);
-    if (this.addressstype == 2) {
-      this.orderstatus = "您的订单已完成";
-      this.isshow = false;
-      this.userisdelivery = "待发货";
-      this.customer = "联系客服申请售后";
-      this.payorsucess = "再次购买";
-    } else if (this.addressstype == 0) {
-      this.orderstatus = "您的订单还未付款，请尽快付款！";
-      this.isshow = false;
-      this.userisdelivery = "待付款";
-      this.customer = "取消订单";
-      this.payorsucess = "立即支付";
-    } else if (this.addressstype == 1) {
-      this.orderstatus = "您的订单已发出，请耐心等候。";
-      this.isshow = true;
-      this.userisdelivery = "待收货";
-      this.customer = "联系客服申请售后";
-      this.payorsucess = "再次购买";
-    } else if (this.addressstype == 3) {
-      this.orderstatus = "您的订单已取消！";
-      this.isshow = false;
-      this.userisdelivery = "已取消";
-      this.customer = "联系客服申请售后";
-      this.payorsucess = "再次购买";
-    }
   },
   components: {
     Myheader,