Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_web_mfyx into debug

controllers/activity.go

@@ -888,7 +888,9 @@ func (this *ActivityNoLoginController) Detail() {
 		resp.SellerName = sellerName
 		resp.SellerMobile = sellerMobile
 
-		resp.IsShowWxPay = utils.IS_SHOW_WX_PAY                                                      //是否展示微信支付按钮
+		if activityInfo.ActiveState == "1" {
+			resp.IsShowWxPay = utils.IS_SHOW_WX_PAY //是否展示微信支付按钮
+		}
 		resp.IsCompanyApply = services.GetUserApplyRecordCountByCompanyIdPay(user.CompanyId)         //获取客户是否有过历史申请记录
 		resp.IsNeedBusinessCard = services.GetCygxUserBusinessCardCount(user.UserId, user.CompanyId) //是否需要上传名片
 	}