|
@@ -296,6 +296,8 @@ func UserStoreOrderDetail(c *gin.Context) { |
|
|
} |
|
|
} |
|
|
orderInfo := db.GetOrderInfoAllEg(svc.MasterDb(c), arg.Oid) |
|
|
orderInfo := db.GetOrderInfoAllEg(svc.MasterDb(c), arg.Oid) |
|
|
if orderInfo != nil { |
|
|
if orderInfo != nil { |
|
|
|
|
|
scheme, host := svc.ImageBucket(c) |
|
|
|
|
|
|
|
|
for _, v := range *orderInfo { |
|
|
for _, v := range *orderInfo { |
|
|
skuData := make([]md.Sku, 0) |
|
|
skuData := make([]md.Sku, 0) |
|
|
json.Unmarshal([]byte(v.SkuInfo), &skuData) |
|
|
json.Unmarshal([]byte(v.SkuInfo), &skuData) |
|
@@ -309,7 +311,7 @@ func UserStoreOrderDetail(c *gin.Context) { |
|
|
tmp := map[string]string{ |
|
|
tmp := map[string]string{ |
|
|
"sku_str": skuStr, |
|
|
"sku_str": skuStr, |
|
|
"goods_title": v.Title, |
|
|
"goods_title": v.Title, |
|
|
"goods_img": v.Img, |
|
|
|
|
|
|
|
|
"goods_img": svc.ImageFormatWithBucket(scheme, host, v.Img), |
|
|
"num": utils.IntToStr(v.Num), |
|
|
"num": utils.IntToStr(v.Num), |
|
|
"amount": utils.Float64ToStr(float64(v.Num) * utils.StrToFloat64(v.Price)), |
|
|
"amount": utils.Float64ToStr(float64(v.Num) * utils.StrToFloat64(v.Price)), |
|
|
} |
|
|
} |
|
@@ -446,12 +448,14 @@ func UserStoreBanner(c *gin.Context) { |
|
|
scheme := svc.SysCfgGet(c, "file_bucket_scheme") |
|
|
scheme := svc.SysCfgGet(c, "file_bucket_scheme") |
|
|
domain := svc.SysCfgGet(c, "file_bucket_host") |
|
|
domain := svc.SysCfgGet(c, "file_bucket_host") |
|
|
linkTypeStr := []string{"内链分享", "外链分享"} |
|
|
linkTypeStr := []string{"内链分享", "外链分享"} |
|
|
|
|
|
scheme, host := svc.ImageBucket(c) |
|
|
|
|
|
|
|
|
for _, v := range *activity { |
|
|
for _, v := range *activity { |
|
|
tmp := map[string]string{ |
|
|
tmp := map[string]string{ |
|
|
"id": utils.IntToStr(v.Id), |
|
|
"id": utils.IntToStr(v.Id), |
|
|
"title": v.Title, |
|
|
"title": v.Title, |
|
|
"link_type_str": linkTypeStr[v.LinkType], |
|
|
"link_type_str": linkTypeStr[v.LinkType], |
|
|
"img": v.Img, |
|
|
|
|
|
|
|
|
"img": svc.ImageFormatWithBucket(scheme, host, v.Img), |
|
|
"img_url": svc.ImageFormatWithBucket(scheme, domain, v.Img), |
|
|
"img_url": svc.ImageFormatWithBucket(scheme, domain, v.Img), |
|
|
"label": v.Label, |
|
|
"label": v.Label, |
|
|
"uid": utils.IntToStr(v.Uid), |
|
|
"uid": utils.IntToStr(v.Uid), |
|
|