Browse Source

no message

xingzai 9 months ago
parent
commit
2c47d7e99d
3 changed files with 4 additions and 1 deletions
  1. 2 0
      controllers/activity.go
  2. 1 1
      controllers/order.go
  3. 1 0
      models/activity.go

+ 2 - 0
controllers/activity.go

@@ -2593,6 +2593,8 @@ func (this *ActivityController) Check() {
 	} else if !resp.CheckSiginUpNum {
 		resp.PopupMsg = "此活动报名人数已满,请留意下期活动"
 	}
+
+	resp.IsShowWxPaySet = utils.IS_SHOW_WX_PAY
 	br.Ret = 200
 	br.Success = true
 	br.Data = resp

+ 1 - 1
controllers/order.go

@@ -421,7 +421,7 @@ func (this *OrderController) UserOrderList() {
 		case 1:
 			item.OrderStatusText = "待支付"
 		case 2:
-			item.OrderStatusText = "支付"
+			item.OrderStatusText = "支付成功"
 		case 3:
 			item.OrderStatusText = "转入退款"
 		case 4:

+ 1 - 0
models/activity.go

@@ -263,6 +263,7 @@ type ActivityCheck struct {
 	ActivityPoints     string                 `description:"本场活动要扣除的点数"`
 	PopupPriceMsg      string                 `description:"价格弹窗信息"`
 	IsShowWxPay        bool                   `description:"是否展示微信支付"`
+	IsShowWxPaySet     bool                   `description:"是否展示微信支付全局设置"` // 配合前端支付进入详情页使用
 	IsCompanyApply     bool                   `description:"机构是否申请过试用"`
 	IsNeedBusinessCard bool                   `description:"是否需要上传名片"`
 	GoodsList          []*order.CygxGoodsResp `description:"商品信息"`