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

controllers/activity.go

@@ -570,9 +570,7 @@ func (this *ActivityCoAntroller) Detail() {
 			//for _, v := range resp.GoodsList {
 			//	resp.PopupPriceMsg += v.PopupPriceMsg //价格弹窗信息
 			//}
-			//if activityInfo.ActiveState == "1" {
-			resp.IsShowWxPay = utils.IS_SHOW_WX_PAY //是否展示微信支付按钮
-			//}
+			resp.IsShowWxPay = utils.IS_SHOW_WX_PAY                                                      //是否展示微信支付按钮
 			resp.IsCompanyApply = services.GetUserApplyRecordCountByCompanyIdPay(user.CompanyId)         //获取客户是否有过历史申请记录
 			resp.IsNeedBusinessCard = services.GetCygxUserBusinessCardCount(user.UserId, user.CompanyId) //是否需要上传名片
 		}