Merge remote-tracking branch 'refs/remotes/origin/dev' into HEAD
Deploy olons-server production / deploy (push) Successful in 3m10s
Deploy olons-server production / deploy (push) Successful in 3m10s
This commit is contained in:
richjohnrambo
@@ -481,7 +481,7 @@ GET /v1/member-levels
|
||||
GET /v1/leaderboard
|
||||
```
|
||||
|
||||
接口要求登录，返回当前租户内已完成任务数量排名前 50 的有效会员。排名只统计
|
||||
接口要求登录，返回当前租户内已完成领取订单总金额排名前 50 的有效会员。页面将订单总金额展示为领取积分，接口字段 `claimed_points` 的单位为分。排名只统计
|
||||
`hg_trade_order.order_type=2 AND order_status=4` 的真实任务订单；昵称由服务端脱敏，前端不得还原或展示手机号。
|
||||
|
||||
```json
|
||||
@@ -492,7 +492,7 @@ GET /v1/leaderboard
|
||||
"rank": 1,
|
||||
"username": "风***淡",
|
||||
"avatar_url": "https://cdn.example.com/avatar.png",
|
||||
"completed_count": 12580,
|
||||
"claimed_points": 125800,
|
||||
"status": "领取成功"
|
||||
}
|
||||
]
|
||||
@@ -743,7 +743,7 @@ GET /v1/manual-products?page=1&page_size=20&category_id=0
|
||||
}
|
||||
```
|
||||
|
||||
金额单位为分。现有 `hg_product` 没有独立摘要字段，`summary` 由商品详情转换为纯文本后截取前 120 个字符。`claimed_count` 统计该商品 `order_type=3` 且状态不是已取消或失败的订单。`is_limited` 在商品配置了 `end_at` 时为 `true`，客户端使用该字段区分限时商品，不根据分类名称推断；`start_at`、`end_at` 为商品展示有效期。
|
||||
金额单位为分。现有 `hg_product` 没有独立摘要字段，`summary` 由商品详情转换为纯文本后截取前 120 个字符。`claimed_count` 直接读取商品表中的固定展示数，不在页面或接口中重新计算。`is_limited` 在商品配置了 `end_at` 时为 `true`，客户端使用该字段区分限时商品，不根据分类名称推断；`start_at`、`end_at` 为商品展示有效期。
|
||||
|
||||
### 8.2 商品详情
|
||||
|
||||
|
||||
@@ -4,7 +4,9 @@ go 1.26.0
|
||||
|
||||
require (
|
||||
github.com/go-sql-driver/mysql v1.10.0
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
github.com/jmoiron/sqlx v1.4.0
|
||||
github.com/minio/minio-go/v7 v7.0.94
|
||||
github.com/prometheus/client_golang v1.23.2
|
||||
github.com/redis/go-redis/v9 v9.12.1
|
||||
golang.org/x/crypto v0.53.0
|
||||
@@ -15,13 +17,25 @@ require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/gorilla/websocket v1.5.3 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/go-ini/ini v1.67.0 // indirect
|
||||
github.com/goccy/go-json v0.10.5 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/klauspost/compress v1.18.0 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
|
||||
github.com/kr/text v0.2.0 // indirect
|
||||
github.com/minio/crc64nvme v1.0.1 // indirect
|
||||
github.com/minio/md5-simd v1.1.2 // indirect
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
|
||||
github.com/prometheus/client_model v0.6.2 // indirect
|
||||
github.com/prometheus/common v0.66.1 // indirect
|
||||
github.com/prometheus/procfs v0.16.1 // indirect
|
||||
github.com/rs/xid v1.6.0 // indirect
|
||||
github.com/tinylib/msgp v1.3.0 // indirect
|
||||
go.yaml.in/yaml/v2 v2.4.2 // indirect
|
||||
golang.org/x/net v0.55.0 // indirect
|
||||
golang.org/x/sys v0.46.0 // indirect
|
||||
golang.org/x/text v0.38.0 // indirect
|
||||
google.golang.org/protobuf v1.36.8 // indirect
|
||||
)
|
||||
|
||||
@@ -14,17 +14,28 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
|
||||
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
|
||||
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
|
||||
github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw=
|
||||
github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
|
||||
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
|
||||
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
||||
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
|
||||
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
|
||||
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
|
||||
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
|
||||
github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
|
||||
github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
@@ -35,8 +46,16 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
||||
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY=
|
||||
github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
|
||||
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
|
||||
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
|
||||
github.com/minio/minio-go/v7 v7.0.94 h1:1ZoksIKPyaSt64AVOyaQvhDOgVC3MfZsWM6mZXRUGtM=
|
||||
github.com/minio/minio-go/v7 v7.0.94/go.mod h1:71t2CqDt3ThzESgZUlU1rBN54mksGGlkLcFgguDnnAc=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY=
|
||||
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
|
||||
@@ -51,16 +70,24 @@ github.com/redis/go-redis/v9 v9.12.1 h1:k5iquqv27aBtnTm2tIkROUDp8JBXhXZIVu1InSgv
|
||||
github.com/redis/go-redis/v9 v9.12.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
|
||||
github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
|
||||
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
|
||||
github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
|
||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
|
||||
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
|
||||
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
|
||||
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
|
||||
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
|
||||
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
|
||||
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
|
||||
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
|
||||
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
|
||||
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
|
||||
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
|
||||
+23
-2
@@ -53,9 +53,30 @@ func New(cfg *config.Config) (*App, error) {
|
||||
taskService := tasks.New(st)
|
||||
mallService := mall.New(st)
|
||||
financeService := finance.New(st, redisClient, cfg.Auth)
|
||||
attachmentService := attachments.New(st, cfg.Upload)
|
||||
uploadConfig := cfg.Upload
|
||||
uploadCtx, uploadCancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
uploadValues, err := st.UploadConfigValues(uploadCtx)
|
||||
uploadCancel()
|
||||
if err != nil {
|
||||
_ = redisClient.Close()
|
||||
_ = st.Close()
|
||||
return nil, err
|
||||
}
|
||||
config.ApplyUploadSystemConfig(&uploadConfig, uploadValues)
|
||||
config.ApplyUploadEnv(&uploadConfig)
|
||||
if err = config.ValidateUpload(uploadConfig); err != nil {
|
||||
_ = redisClient.Close()
|
||||
_ = st.Close()
|
||||
return nil, err
|
||||
}
|
||||
attachmentService, err := attachments.New(st, uploadConfig)
|
||||
if err != nil {
|
||||
_ = redisClient.Close()
|
||||
_ = st.Close()
|
||||
return nil, err
|
||||
}
|
||||
supportService := support.New(st, imclient.New(cfg.IM), cfg.Auth)
|
||||
return &App{store: st, redis: redisClient, api: httpapi.New(authenticator, accountService, portalService, taskService, mallService, financeService, attachmentService, supportService), frontendPath: cfg.FrontendDir, upload: cfg.Upload}, nil
|
||||
return &App{store: st, redis: redisClient, api: httpapi.New(authenticator, accountService, portalService, taskService, mallService, financeService, attachmentService, supportService), frontendPath: cfg.FrontendDir, upload: uploadConfig}, nil
|
||||
}
|
||||
|
||||
func (a *App) Handler() http.Handler {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package attachments
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"crypto/rand"
|
||||
@@ -8,12 +9,17 @@ import (
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"git.118im.com/im_team/olons_server/internal/config"
|
||||
"git.118im.com/im_team/olons_server/internal/store"
|
||||
"github.com/minio/minio-go/v7"
|
||||
"github.com/minio/minio-go/v7/pkg/credentials"
|
||||
)
|
||||
|
||||
const maxImageSize = 5 << 20
|
||||
@@ -27,10 +33,23 @@ type Repository interface {
|
||||
type Service struct {
|
||||
repository Repository
|
||||
cfg config.UploadConfig
|
||||
minio *minio.Client
|
||||
}
|
||||
|
||||
func New(repository Repository, cfg config.UploadConfig) *Service {
|
||||
return &Service{repository: repository, cfg: cfg}
|
||||
func New(repository Repository, cfg config.UploadConfig) (*Service, error) {
|
||||
service := &Service{repository: repository, cfg: cfg}
|
||||
if strings.EqualFold(cfg.Driver, "minio") {
|
||||
client, err := minio.New(strings.TrimSpace(cfg.Endpoint), &minio.Options{
|
||||
Creds: credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
|
||||
Secure: cfg.Secure,
|
||||
Region: cfg.Region,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
service.minio = client
|
||||
}
|
||||
return service, nil
|
||||
}
|
||||
|
||||
func (s *Service) UploadImage(ctx context.Context, memberID int64, name string, reader io.Reader) (*store.Attachment, error) {
|
||||
@@ -52,22 +71,54 @@ func (s *Service) UploadImage(ctx context.Context, memberID int64, name string,
|
||||
return nil, err
|
||||
}
|
||||
fileName := hex.EncodeToString(random) + ext
|
||||
if err = os.MkdirAll(s.cfg.Dir, 0o750); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
path := filepath.Join(s.cfg.Dir, fileName)
|
||||
if err = os.WriteFile(path, data, 0o640); err != nil {
|
||||
storedPath, publicURL, err := s.store(ctx, fileName, mimeType, data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
digest := md5.Sum(data)
|
||||
publicPath := strings.TrimRight(s.cfg.PublicPath, "/") + "/" + fileName
|
||||
attachment, err := s.repository.CreateAttachment(ctx, store.AttachmentCreation{
|
||||
MemberID: memberID, Name: filepath.Base(name), MimeType: mimeType, Path: path,
|
||||
URL: publicPath, Size: int64(len(data)), Ext: strings.TrimPrefix(ext, "."), MD5: hex.EncodeToString(digest[:]),
|
||||
MemberID: memberID, Drive: strings.ToLower(strings.TrimSpace(s.cfg.Driver)), Name: filepath.Base(name), MimeType: mimeType, Path: storedPath,
|
||||
URL: publicURL, Size: int64(len(data)), Ext: strings.TrimPrefix(ext, "."), MD5: hex.EncodeToString(digest[:]),
|
||||
})
|
||||
if err != nil {
|
||||
_ = os.Remove(path)
|
||||
s.remove(ctx, storedPath)
|
||||
return nil, err
|
||||
}
|
||||
return attachment, nil
|
||||
}
|
||||
|
||||
func (s *Service) store(ctx context.Context, fileName, mimeType string, data []byte) (string, string, error) {
|
||||
if s.minio != nil {
|
||||
objectName := path.Join(strings.Trim(s.cfg.Path, "/"), time.Now().UTC().Format("2006/01/02"), fileName)
|
||||
_, err := s.minio.PutObject(ctx, s.cfg.Bucket, objectName, bytes.NewReader(data), int64(len(data)), minio.PutObjectOptions{ContentType: mimeType})
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
return objectName, minioPublicURL(s.cfg.Domain, s.cfg.Bucket, objectName), nil
|
||||
}
|
||||
if err := os.MkdirAll(s.cfg.Dir, 0o750); err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
localPath := filepath.Join(s.cfg.Dir, fileName)
|
||||
if err := os.WriteFile(localPath, data, 0o640); err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
return localPath, strings.TrimRight(s.cfg.PublicPath, "/") + "/" + fileName, nil
|
||||
}
|
||||
|
||||
func (s *Service) remove(ctx context.Context, storedPath string) {
|
||||
if s.minio != nil {
|
||||
_ = s.minio.RemoveObject(ctx, s.cfg.Bucket, storedPath, minio.RemoveObjectOptions{})
|
||||
return
|
||||
}
|
||||
_ = os.Remove(storedPath)
|
||||
}
|
||||
|
||||
func minioPublicURL(domain, bucket, objectName string) string {
|
||||
base := strings.TrimRight(strings.TrimSpace(domain), "/")
|
||||
segments := strings.Split(strings.Trim(objectName, "/"), "/")
|
||||
for i := range segments {
|
||||
segments[i] = url.PathEscape(segments[i])
|
||||
}
|
||||
return base + "/" + url.PathEscape(bucket) + "/" + strings.Join(segments, "/")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package attachments
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestMinioPublicURL(t *testing.T) {
|
||||
got := minioPublicURL("https://minio.example.com/", "bucket", "images/2026/10/17/a b.jpg")
|
||||
want := "https://minio.example.com/bucket/images/2026/10/17/a%20b.jpg"
|
||||
if got != want {
|
||||
t.Fatalf("minioPublicURL() = %q, want %q", got, want)
|
||||
}
|
||||
}
|
||||
@@ -37,8 +37,17 @@ type IMConfig struct {
|
||||
}
|
||||
|
||||
type UploadConfig struct {
|
||||
Driver string `json:"driver"`
|
||||
Dir string `json:"dir"`
|
||||
PublicPath string `json:"public_path"`
|
||||
AccessKey string `json:"access_key"`
|
||||
SecretKey string `json:"secret_key"`
|
||||
Endpoint string `json:"endpoint"`
|
||||
Secure bool `json:"secure"`
|
||||
Path string `json:"path"`
|
||||
Bucket string `json:"bucket"`
|
||||
Domain string `json:"domain"`
|
||||
Region string `json:"region"`
|
||||
}
|
||||
|
||||
type MySQLConfig struct {
|
||||
@@ -100,7 +109,7 @@ func defaultConfig() *Config {
|
||||
DefaultTenantID: 0,
|
||||
RequiredAPIKey: true,
|
||||
},
|
||||
Upload: UploadConfig{Dir: "storage/uploads", PublicPath: "/uploads"},
|
||||
Upload: UploadConfig{Driver: "local", Dir: "storage/uploads", PublicPath: "/uploads", Region: "us-east-1"},
|
||||
IM: IMConfig{
|
||||
BaseURL: "https://api.118im.com", HTTPAPIURL: "https://api.118im.com/v1/im",
|
||||
WebSocketURL: "wss://api.118im.com/v0/channels", FileURL: "https://api.118im.com/v0/file",
|
||||
@@ -130,8 +139,7 @@ func applyEnv(cfg *Config) {
|
||||
setString(&cfg.Auth.FinanceMasterKey, "OLONS_SERVER_FINANCE_MASTER_KEY")
|
||||
setBool(&cfg.Auth.AllowDevHeaderAuth, "OLONS_SERVER_ALLOW_DEV_HEADER_AUTH")
|
||||
setBool(&cfg.Auth.RequiredAPIKey, "OLONS_SERVER_REQUIRED_API_KEY")
|
||||
setString(&cfg.Upload.Dir, "OLONS_SERVER_UPLOAD_DIR")
|
||||
setString(&cfg.Upload.PublicPath, "OLONS_SERVER_UPLOAD_PUBLIC_PATH")
|
||||
ApplyUploadEnv(&cfg.Upload)
|
||||
setString(&cfg.IM.BaseURL, "OLONS_IM_BASE_URL")
|
||||
setString(&cfg.IM.HTTPAPIURL, "OLONS_IM_HTTP_API_URL")
|
||||
setString(&cfg.IM.WebSocketURL, "OLONS_IM_WS_URL")
|
||||
@@ -172,8 +180,8 @@ func (c *Config) validate() error {
|
||||
if c.Auth.DefaultTenantID < 0 {
|
||||
return errors.New("default tenant id must not be negative")
|
||||
}
|
||||
if strings.TrimSpace(c.Upload.Dir) == "" || !strings.HasPrefix(c.Upload.PublicPath, "/") {
|
||||
return errors.New("upload config is invalid")
|
||||
if err := ValidateUpload(c.Upload); err != nil {
|
||||
return err
|
||||
}
|
||||
if c.IM.Timeout <= 0 {
|
||||
c.IM.Timeout = 8 * time.Second
|
||||
@@ -181,6 +189,64 @@ func (c *Config) validate() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func ApplyUploadSystemConfig(cfg *UploadConfig, values map[string]string) {
|
||||
if cfg == nil {
|
||||
return
|
||||
}
|
||||
setMapString(&cfg.Driver, values, "uploadDrive")
|
||||
setMapString(&cfg.AccessKey, values, "uploadMinioAccessKey")
|
||||
setMapString(&cfg.SecretKey, values, "uploadMinioSecretKey")
|
||||
setMapString(&cfg.Endpoint, values, "uploadMinioEndpoint")
|
||||
setMapString(&cfg.Path, values, "uploadMinioPath")
|
||||
setMapString(&cfg.Bucket, values, "uploadMinioBucket")
|
||||
setMapString(&cfg.Domain, values, "uploadMinioDomain")
|
||||
if value := strings.TrimSpace(values["uploadMinioUseSSL"]); value != "" {
|
||||
cfg.Secure = value == "1" || strings.EqualFold(value, "true")
|
||||
}
|
||||
}
|
||||
|
||||
func ApplyUploadEnv(cfg *UploadConfig) {
|
||||
if cfg == nil {
|
||||
return
|
||||
}
|
||||
setString(&cfg.Driver, "OLONS_SERVER_UPLOAD_DRIVER")
|
||||
setString(&cfg.Dir, "OLONS_SERVER_UPLOAD_DIR")
|
||||
setString(&cfg.PublicPath, "OLONS_SERVER_UPLOAD_PUBLIC_PATH")
|
||||
setString(&cfg.AccessKey, "OLONS_SERVER_MINIO_ACCESS_KEY")
|
||||
setString(&cfg.SecretKey, "OLONS_SERVER_MINIO_SECRET_KEY")
|
||||
setString(&cfg.Endpoint, "OLONS_SERVER_MINIO_ENDPOINT")
|
||||
setString(&cfg.Path, "OLONS_SERVER_MINIO_PATH")
|
||||
setString(&cfg.Bucket, "OLONS_SERVER_MINIO_BUCKET")
|
||||
setString(&cfg.Domain, "OLONS_SERVER_MINIO_DOMAIN")
|
||||
setString(&cfg.Region, "OLONS_SERVER_MINIO_REGION")
|
||||
if value := strings.TrimSpace(os.Getenv("OLONS_SERVER_MINIO_SECURE")); value != "" {
|
||||
cfg.Secure = value == "1" || strings.EqualFold(value, "true")
|
||||
}
|
||||
}
|
||||
|
||||
func ValidateUpload(cfg UploadConfig) error {
|
||||
switch strings.ToLower(strings.TrimSpace(cfg.Driver)) {
|
||||
case "local":
|
||||
if strings.TrimSpace(cfg.Dir) == "" || !strings.HasPrefix(cfg.PublicPath, "/") {
|
||||
return errors.New("local upload config is invalid")
|
||||
}
|
||||
case "minio":
|
||||
if strings.TrimSpace(cfg.AccessKey) == "" || strings.TrimSpace(cfg.SecretKey) == "" ||
|
||||
strings.TrimSpace(cfg.Endpoint) == "" || strings.TrimSpace(cfg.Bucket) == "" || strings.TrimSpace(cfg.Domain) == "" {
|
||||
return errors.New("minio upload config is incomplete")
|
||||
}
|
||||
default:
|
||||
return errors.New("upload driver is unsupported")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func setMapString(target *string, values map[string]string, key string) {
|
||||
if value := strings.TrimSpace(values[key]); value != "" {
|
||||
*target = value
|
||||
}
|
||||
}
|
||||
|
||||
func setString(target *string, key string) {
|
||||
if value := strings.TrimSpace(os.Getenv(key)); value != "" {
|
||||
*target = value
|
||||
|
||||
@@ -19,3 +19,29 @@ func TestConfigRejectsOtherDatabase(t *testing.T) {
|
||||
t.Fatal("expected non-olons_admin database to be rejected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyUploadSystemConfig(t *testing.T) {
|
||||
cfg := UploadConfig{Driver: "local", Region: "us-east-1"}
|
||||
ApplyUploadSystemConfig(&cfg, map[string]string{
|
||||
"uploadDrive": "minio",
|
||||
"uploadMinioAccessKey": "access",
|
||||
"uploadMinioSecretKey": "secret",
|
||||
"uploadMinioEndpoint": "minio.example.com",
|
||||
"uploadMinioUseSSL": "1",
|
||||
"uploadMinioPath": "images/",
|
||||
"uploadMinioBucket": "bucket",
|
||||
"uploadMinioDomain": "https://cdn.example.com",
|
||||
})
|
||||
if err := ValidateUpload(cfg); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if cfg.Driver != "minio" || !cfg.Secure || cfg.Bucket != "bucket" || cfg.Path != "images/" {
|
||||
t.Fatalf("unexpected upload config: %+v", cfg)
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateUploadRejectsIncompleteMinio(t *testing.T) {
|
||||
if err := ValidateUpload(UploadConfig{Driver: "minio"}); err == nil {
|
||||
t.Fatal("expected incomplete minio config to be rejected")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -803,7 +803,10 @@ func (s *Service) ensureWithdrawalEnabled(ctx context.Context, tenantID int64) e
|
||||
return err
|
||||
}
|
||||
var config map[string]any
|
||||
if json.Unmarshal(raw, &config) != nil || !findBool(config, "withdrawal_enabled", "withdrawalEnabled", "WITHDRAWAL") {
|
||||
if json.Unmarshal(raw, &config) != nil {
|
||||
config = map[string]any{}
|
||||
}
|
||||
if enabled, found := findBoolValue(config, "withdrawal_enabled", "withdrawalEnabled", "WITHDRAWAL"); found && !enabled {
|
||||
return store.ErrWithdrawalDisabled
|
||||
}
|
||||
return nil
|
||||
@@ -1142,25 +1145,28 @@ func allDigits(value string) bool {
|
||||
return value != ""
|
||||
}
|
||||
|
||||
func findBool(config map[string]any, keys ...string) bool {
|
||||
func findBoolValue(config map[string]any, keys ...string) (bool, bool) {
|
||||
for _, key := range keys {
|
||||
for candidate, value := range config {
|
||||
if strings.EqualFold(candidate, key) {
|
||||
switch typed := value.(type) {
|
||||
case bool:
|
||||
return typed
|
||||
return typed, true
|
||||
case float64:
|
||||
return typed == 1
|
||||
return typed == 1, true
|
||||
case string:
|
||||
return typed == "1" || strings.EqualFold(typed, "true") || strings.EqualFold(typed, "on")
|
||||
return typed == "1" || strings.EqualFold(typed, "true") || strings.EqualFold(typed, "on"), true
|
||||
}
|
||||
return false, true
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, value := range config {
|
||||
if nested, ok := value.(map[string]any); ok && findBool(nested, keys...) {
|
||||
return true
|
||||
if nested, ok := value.(map[string]any); ok {
|
||||
if result, found := findBoolValue(nested, keys...); found {
|
||||
return result, true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
return false, false
|
||||
}
|
||||
|
||||
@@ -118,11 +118,18 @@ func TestQuoteCalculatesRateFeeAndLimits(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestQuoteFailsClosed(t *testing.T) {
|
||||
func TestQuoteDefaultsToEnabledWithoutWithdrawalSwitch(t *testing.T) {
|
||||
service := &Service{repository: &fakeRepository{config: json.RawMessage(`{}`)}, ready: true, now: time.Now}
|
||||
if err := service.ensureWithdrawalEnabled(context.Background(), 0); err != nil {
|
||||
t.Fatalf("missing switch should default to enabled, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestQuoteHonorsExplicitDisabledWithdrawalSwitch(t *testing.T) {
|
||||
service := &Service{repository: &fakeRepository{config: json.RawMessage(`{"features":{"withdrawal_enabled":false}}`)}, ready: true, now: time.Now}
|
||||
_, err := service.Quote(context.Background(), 0, 1, QuoteInput{PaymentAccountID: 1, Amount: 100, Currency: "CNY"})
|
||||
if !errors.Is(err, store.ErrWithdrawalDisabled) {
|
||||
t.Fatalf("expected disabled error, got %v", err)
|
||||
t.Fatalf("expected explicitly disabled withdrawal, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ func (c *Client) ResetPassword(ctx context.Context, userID, password string) err
|
||||
}
|
||||
path := "/internal/admin-query/tenants/" + url.PathEscape(c.cfg.TenantCode) + "/users/" + url.PathEscape(userID) + "/action"
|
||||
return c.internalJSON(ctx, http.MethodPost, path, map[string]any{
|
||||
"event_type": "user.password.reset", "password_hash": base64.StdEncoding.EncodeToString(hash), "reason": "Olons客服系统凭据同步",
|
||||
"event_type": "user.password.reset", "password_hash": base64.StdEncoding.EncodeToString(hash), "reason": "悦选客服系统凭据同步",
|
||||
}, nil)
|
||||
}
|
||||
|
||||
|
||||
+31
-21
@@ -110,11 +110,11 @@ type MemberLevel struct {
|
||||
}
|
||||
|
||||
type LeaderboardEntry struct {
|
||||
Rank int `json:"rank"`
|
||||
Username string `json:"username"`
|
||||
AvatarURL string `json:"avatar_url"`
|
||||
CompletedCount int64 `json:"completed_count"`
|
||||
Status string `json:"status"`
|
||||
Rank int `json:"rank"`
|
||||
Username string `json:"username"`
|
||||
AvatarURL string `json:"avatar_url"`
|
||||
ClaimedPoints int64 `json:"claimed_points"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
||||
type CustomerService struct {
|
||||
@@ -287,7 +287,7 @@ func (s *Service) Leaderboard(ctx context.Context, tenantID int64) ([]Leaderboar
|
||||
items := make([]LeaderboardEntry, 0, len(rows))
|
||||
for index, row := range rows {
|
||||
items = append(items, LeaderboardEntry{Rank: index + 1, Username: maskedUsername(row.Username),
|
||||
AvatarURL: row.AvatarURL, CompletedCount: row.CompletedCount, Status: "领取成功"})
|
||||
AvatarURL: row.AvatarURL, ClaimedPoints: row.ClaimedPoints, Status: "领取成功"})
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
@@ -328,30 +328,40 @@ func maskedUsername(value string) string {
|
||||
func parseFeatures(raw json.RawMessage) Features {
|
||||
var config map[string]any
|
||||
if json.Unmarshal(raw, &config) != nil {
|
||||
return Features{}
|
||||
config = map[string]any{}
|
||||
}
|
||||
return Features{
|
||||
TaskEnabled: findBool(config, "task_enabled", "taskEnabled", "TASK"),
|
||||
RechargeEnabled: findBool(config, "recharge_enabled", "rechargeEnabled", "RECHARGE"),
|
||||
WithdrawalEnabled: findBool(config, "withdrawal_enabled", "withdrawalEnabled", "WITHDRAWAL"),
|
||||
ManualMallEnabled: findBool(config, "manual_mall_enabled", "manualMallEnabled", "SHOP_STATUS"),
|
||||
TaskEnabled: findBoolDefault(config, true, "task_enabled", "taskEnabled", "TASK"),
|
||||
RechargeEnabled: findBoolDefault(config, true, "recharge_enabled", "rechargeEnabled", "RECHARGE"),
|
||||
WithdrawalEnabled: findBoolDefault(config, true, "withdrawal_enabled", "withdrawalEnabled", "WITHDRAWAL"),
|
||||
ManualMallEnabled: findBoolDefault(config, true, "manual_mall_enabled", "manualMallEnabled", "SHOP_STATUS"),
|
||||
}
|
||||
}
|
||||
|
||||
func findBool(config map[string]any, keys ...string) bool {
|
||||
for _, key := range keys {
|
||||
if value, ok := config[key]; ok {
|
||||
return boolValue(value)
|
||||
}
|
||||
func findBoolDefault(config map[string]any, defaultValue bool, keys ...string) bool {
|
||||
value, found := findBoolValue(config, keys...)
|
||||
if !found {
|
||||
return defaultValue
|
||||
}
|
||||
if nested, ok := config["features"].(map[string]any); ok {
|
||||
for _, key := range keys {
|
||||
if value, found := nested[key]; found {
|
||||
return boolValue(value)
|
||||
return value
|
||||
}
|
||||
|
||||
func findBoolValue(config map[string]any, keys ...string) (bool, bool) {
|
||||
for _, key := range keys {
|
||||
for candidate, value := range config {
|
||||
if strings.EqualFold(candidate, key) {
|
||||
return boolValue(value), true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
for _, value := range config {
|
||||
if nested, ok := value.(map[string]any); ok {
|
||||
if result, found := findBoolValue(nested, keys...); found {
|
||||
return result, true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false, false
|
||||
}
|
||||
|
||||
func boolValue(value any) bool {
|
||||
|
||||
@@ -77,6 +77,18 @@ func TestParseFeaturesSupportsNestedAndLegacyKeys(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseFeaturesDefaultsMissingSwitchesToEnabled(t *testing.T) {
|
||||
features := parseFeatures(json.RawMessage(`{}`))
|
||||
if !features.TaskEnabled || !features.RechargeEnabled || !features.WithdrawalEnabled || !features.ManualMallEnabled {
|
||||
t.Fatalf("missing switches should default to enabled: %+v", features)
|
||||
}
|
||||
|
||||
features = parseFeatures(json.RawMessage(`{"features":{"task_enabled":false,"withdrawal_enabled":false}}`))
|
||||
if features.TaskEnabled || features.WithdrawalEnabled || !features.RechargeEnabled || !features.ManualMallEnabled {
|
||||
t.Fatalf("explicitly disabled switches must remain disabled: %+v", features)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBannersSanitizeTargets(t *testing.T) {
|
||||
service := New(fakeRepository{banners: []store.Banner{
|
||||
{ID: 1, TargetType: 2, TargetValue: "/receive"},
|
||||
@@ -153,15 +165,15 @@ func TestHomeUsesSettledSummaryAndSnakeCaseJSON(t *testing.T) {
|
||||
|
||||
func TestLeaderboardMasksUsernameAndAddsRank(t *testing.T) {
|
||||
service := New(fakeRepository{leaders: []store.LeaderboardMember{
|
||||
{MemberID: 7, Username: "风轻云淡", CompletedCount: 12},
|
||||
{MemberID: 8, Username: "李明", CompletedCount: 9},
|
||||
{MemberID: 7, Username: "风轻云淡", ClaimedPoints: 125800},
|
||||
{MemberID: 8, Username: "李明", ClaimedPoints: 96000},
|
||||
}})
|
||||
items, err := service.Leaderboard(context.Background(), 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(items) != 2 || items[0].Rank != 1 || items[0].Username != "风***淡" ||
|
||||
items[1].Username != "李*" || items[1].Status != "领取成功" {
|
||||
items[0].ClaimedPoints != 125800 || items[1].Username != "李*" || items[1].Status != "领取成功" {
|
||||
t.Fatalf("unexpected leaderboard: %+v", items)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import "context"
|
||||
|
||||
type AttachmentCreation struct {
|
||||
MemberID int64
|
||||
Drive string
|
||||
Name string
|
||||
MimeType string
|
||||
Path string
|
||||
@@ -21,8 +22,8 @@ type Attachment struct {
|
||||
func (s *Store) CreateAttachment(ctx context.Context, input AttachmentCreation) (*Attachment, error) {
|
||||
result, err := s.db.ExecContext(ctx, `INSERT INTO hg_sys_attachment
|
||||
(app_id,member_id,cate_id,drive,name,kind,mime_type,naive_type,path,file_url,size,ext,md5,status,created_at,updated_at)
|
||||
VALUES('olons_server',?,0,'local',?,'image',?,'image',?,?,?, ?,?,1,UTC_TIMESTAMP(),UTC_TIMESTAMP())`,
|
||||
input.MemberID, input.Name, input.MimeType, input.Path, input.URL, input.Size, input.Ext, input.MD5)
|
||||
VALUES('olons_server',?,0,?,?,'image',?,'image',?,?,?, ?,?,1,UTC_TIMESTAMP(),UTC_TIMESTAMP())`,
|
||||
input.MemberID, input.Drive, input.Name, input.MimeType, input.Path, input.URL, input.Size, input.Ext, input.MD5)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -73,8 +73,7 @@ func manualProductSelectSQL() string {
|
||||
COALESCE(p.detail_html,'') AS detail_html,(p.is_recommended=1) AS is_recommended,
|
||||
COALESCE(DATE_FORMAT(p.start_at,'%Y-%m-%dT%H:%i:%sZ'),'') AS start_at,
|
||||
COALESCE(DATE_FORMAT(p.end_at,'%Y-%m-%dT%H:%i:%sZ'),'') AS end_at,
|
||||
(SELECT COUNT(*) FROM hg_trade_order o WHERE o.tenant_id=p.tenant_id AND o.product_id=p.id
|
||||
AND o.order_type=3 AND o.order_status NOT IN (7,8)) AS claimed_count,
|
||||
p.claimed_count,
|
||||
DATE_FORMAT(p.created_at,'%Y-%m-%dT%H:%i:%sZ') AS created_at,
|
||||
DATE_FORMAT(p.updated_at,'%Y-%m-%dT%H:%i:%sZ') AS updated_at
|
||||
FROM hg_product p JOIN hg_product_category c
|
||||
|
||||
@@ -68,10 +68,10 @@ type TaskSummary struct {
|
||||
}
|
||||
|
||||
type LeaderboardMember struct {
|
||||
MemberID int64 `db:"member_id"`
|
||||
Username string `db:"username"`
|
||||
AvatarURL string `db:"avatar_url"`
|
||||
CompletedCount int64 `db:"completed_count"`
|
||||
MemberID int64 `db:"member_id"`
|
||||
Username string `db:"username"`
|
||||
AvatarURL string `db:"avatar_url"`
|
||||
ClaimedPoints int64 `db:"claimed_points"`
|
||||
}
|
||||
|
||||
type CustomerService struct {
|
||||
@@ -250,7 +250,7 @@ func (s *Store) TaskLeaderboard(ctx context.Context, tenantID int64, limit int)
|
||||
}
|
||||
rows := make([]LeaderboardMember, 0)
|
||||
err := s.db.SelectContext(ctx, &rows, `SELECT m.id AS member_id,m.username,
|
||||
COALESCE(a.file_url,'') AS avatar_url,COUNT(o.id) AS completed_count
|
||||
COALESCE(a.file_url,'') AS avatar_url,COALESCE(SUM(o.total_amount),0) AS claimed_points
|
||||
FROM hg_app_member m
|
||||
LEFT JOIN hg_app_member_profile p ON p.tenant_id=m.tenant_id AND p.member_id=m.id
|
||||
LEFT JOIN hg_sys_attachment a ON a.id=p.avatar_attachment_id AND a.status=1
|
||||
@@ -258,7 +258,7 @@ func (s *Store) TaskLeaderboard(ctx context.Context, tenantID int64, limit int)
|
||||
AND o.order_type=2 AND o.order_status=4
|
||||
WHERE m.tenant_id=? AND m.member_status=1 AND m.deleted_at IS NULL
|
||||
GROUP BY m.id,m.username,a.file_url
|
||||
ORDER BY completed_count DESC,m.id ASC LIMIT ?`, tenantID, limit)
|
||||
ORDER BY claimed_points DESC,m.id ASC LIMIT ?`, tenantID, limit)
|
||||
return rows, err
|
||||
}
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ func (s *Store) ClaimTask(ctx context.Context, input ClaimTaskInput) (*TaskOrder
|
||||
if wallet.Status != 1 {
|
||||
return nil, ErrAccountRestricted
|
||||
}
|
||||
if member.AutoDispatch == 1 && (wallet.AvailableAmount <= 0 || wallet.AvailableAmount < input.MinimumAmount) {
|
||||
if wallet.AvailableAmount < input.MinimumAmount {
|
||||
return nil, ErrInsufficientBalance
|
||||
}
|
||||
var pending int64
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package store
|
||||
|
||||
import "context"
|
||||
|
||||
func (s *Store) UploadConfigValues(ctx context.Context) (map[string]string, error) {
|
||||
rows, err := s.db.QueryContext(ctx, "SELECT `key`, `value` FROM hg_sys_config WHERE `group`='upload' AND status=1")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
values := make(map[string]string)
|
||||
for rows.Next() {
|
||||
var key, value string
|
||||
if err = rows.Scan(&key, &value); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
values[key] = value
|
||||
}
|
||||
return values, rows.Err()
|
||||
}
|
||||
+11
-49
@@ -18,10 +18,11 @@ const (
|
||||
defaultPageSize = 20
|
||||
maxPageSize = 100
|
||||
defaultDeadlineMinute = 15
|
||||
minimumClaimAmount = 29900
|
||||
businessDisplayStart = "09:00:00+08:00"
|
||||
businessDisplayEnd = "21:00:00+08:00"
|
||||
)
|
||||
|
||||
var shanghai = time.FixedZone("Asia/Shanghai", 8*60*60)
|
||||
|
||||
type Repository interface {
|
||||
CurrentSiteConfig(context.Context, int64) (json.RawMessage, error)
|
||||
TaskHalls(context.Context, int64, int64) ([]store.TaskHall, error)
|
||||
@@ -158,8 +159,6 @@ type taskPolicy struct {
|
||||
AutoDelay int
|
||||
AutoMinAmount int64
|
||||
AutoMaxAmount int64
|
||||
Start string
|
||||
End string
|
||||
Deadline time.Duration
|
||||
}
|
||||
|
||||
@@ -194,20 +193,18 @@ func (s *Service) Eligibility(ctx context.Context, tenantID, memberID, hallID in
|
||||
}
|
||||
result := &Eligibility{Eligible: true, AvailableAmount: row.AvailableAmount, MinimumAmount: policy.MinimumAmount,
|
||||
TodayCount: row.TodayCount, DailyLimit: row.DailyLimit, PendingOrderID: row.PendingOrderID,
|
||||
BusinessStartAt: policy.Start + "+08:00", BusinessEndAt: policy.End + "+08:00"}
|
||||
BusinessStartAt: businessDisplayStart, BusinessEndAt: businessDisplayEnd}
|
||||
switch {
|
||||
case !policy.Enabled:
|
||||
result.reject("TASK_DISABLED", "任务功能未开启")
|
||||
case !withinBusinessHours(s.now().In(shanghai), policy.Start, policy.End):
|
||||
result.reject("OUTSIDE_BUSINESS_HOURS", "当前不在营业时间")
|
||||
case row.MemberStatus != 1:
|
||||
result.reject("ACCOUNT_RESTRICTED", "账户状态受限")
|
||||
case !row.HallEligible:
|
||||
result.reject("LEVEL_NOT_ELIGIBLE", "当前等级不能进入该任务大厅")
|
||||
case row.WalletStatus != 1:
|
||||
result.reject("ACCOUNT_RESTRICTED", "账户状态受限")
|
||||
case row.AutoDispatch == 1 && (row.AvailableAmount <= 0 || row.AvailableAmount < policy.MinimumAmount):
|
||||
result.reject("INSUFFICIENT_BALANCE", "可用余额不足")
|
||||
case row.AvailableAmount < policy.MinimumAmount:
|
||||
result.reject("INSUFFICIENT_BALANCE", "可用余额不足299元")
|
||||
case row.DailyLimit > 0 && row.TodayCount >= row.DailyLimit:
|
||||
result.reject("DAILY_LIMIT_REACHED", "已达当日领取上限")
|
||||
case row.PendingOrderID > 0:
|
||||
@@ -233,9 +230,6 @@ func (s *Service) Claim(ctx context.Context, tenantID, memberID, hallID int64) (
|
||||
if !policy.Enabled {
|
||||
return nil, ErrTaskDisabled
|
||||
}
|
||||
if !withinBusinessHours(s.now().In(shanghai), policy.Start, policy.End) {
|
||||
return nil, ErrOutsideBusinessHour
|
||||
}
|
||||
now := s.now().UTC()
|
||||
row, err := s.repository.ClaimTask(ctx, store.ClaimTaskInput{TenantID: tenantID, MemberID: memberID,
|
||||
HallID: hallID, MinimumAmount: policy.MinimumAmount, AutoDelay: policy.AutoDelay,
|
||||
@@ -379,14 +373,14 @@ func (s *Service) policy(ctx context.Context, tenantID int64) (taskPolicy, error
|
||||
if minutes <= 0 || minutes > 24*60 {
|
||||
minutes = defaultDeadlineMinute
|
||||
}
|
||||
start := clockValue(findValue(config, "task_business_start_at", "business_start_at", "taskBusinessStartAt"), "00:00:00")
|
||||
end := clockValue(findValue(config, "task_business_end_at", "business_end_at", "taskBusinessEndAt"), "23:59:59")
|
||||
return taskPolicy{Enabled: boolValue(findValue(config, "task_enabled", "taskEnabled", "TASK")),
|
||||
MinimumAmount: max64(0, int64Value(findValue(config, "task_minimum_amount", "minimum_balance_amount", "taskMinimumAmount"))),
|
||||
enabledValue := findValue(config, "task_enabled", "taskEnabled", "TASK")
|
||||
enabled := enabledValue == nil || boolValue(enabledValue)
|
||||
return taskPolicy{Enabled: enabled,
|
||||
MinimumAmount: minimumClaimAmount,
|
||||
AutoDelay: max(0, intValue(findValue(config, "auto_order_delay_seconds", "autoOrderDelaySeconds"))),
|
||||
AutoMinAmount: max64(0, int64Value(findValue(config, "auto_order_min_amount", "autoOrderMinAmount"))),
|
||||
AutoMaxAmount: max64(0, int64Value(findValue(config, "auto_order_max_amount", "autoOrderMaxAmount"))),
|
||||
Start: start, End: end, Deadline: time.Duration(minutes) * time.Minute}, nil
|
||||
Deadline: time.Duration(minutes) * time.Minute}, nil
|
||||
}
|
||||
|
||||
func orderFromStore(row store.TaskOrder, detail bool) Order {
|
||||
@@ -506,38 +500,6 @@ func submissionStatusText(status int) string {
|
||||
return names[status]
|
||||
}
|
||||
|
||||
func withinBusinessHours(now time.Time, start, end string) bool {
|
||||
current := now.Hour()*3600 + now.Minute()*60 + now.Second()
|
||||
startSecond := parseClock(start)
|
||||
endSecond := parseClock(end)
|
||||
if startSecond <= endSecond {
|
||||
return current >= startSecond && current <= endSecond
|
||||
}
|
||||
return current >= startSecond || current <= endSecond
|
||||
}
|
||||
|
||||
func parseClock(value string) int {
|
||||
parsed, err := time.Parse("15:04:05", value)
|
||||
if err != nil {
|
||||
return 0
|
||||
}
|
||||
return parsed.Hour()*3600 + parsed.Minute()*60 + parsed.Second()
|
||||
}
|
||||
|
||||
func clockValue(value any, fallback string) string {
|
||||
raw, ok := value.(string)
|
||||
if !ok {
|
||||
return fallback
|
||||
}
|
||||
raw = strings.TrimSpace(raw)
|
||||
for _, layout := range []string{"15:04:05", "15:04"} {
|
||||
if parsed, err := time.Parse(layout, raw); err == nil {
|
||||
return parsed.Format("15:04:05")
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func findValue(config map[string]any, keys ...string) any {
|
||||
for _, key := range keys {
|
||||
for candidate, value := range config {
|
||||
|
||||
@@ -62,58 +62,66 @@ func (f *fakeRepository) OrderLedgers(context.Context, int64, int64, []string) (
|
||||
return []map[string]any{}, nil
|
||||
}
|
||||
|
||||
func TestEligibilityAppliesPublishedPolicy(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":true},"task_minimum_amount":50000,"task_business_start_at":"09:00","task_business_end_at":"22:00"}`),
|
||||
eligibility: &store.TaskEligibility{MemberStatus: 1, AutoDispatch: 1, HallEligible: true, AvailableAmount: 49999, WalletStatus: 1, DailyLimit: 5, TodayCount: 2}}
|
||||
func TestEligibilityRequiresFixedMinimumBalance(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":true},"task_minimum_amount":0}`),
|
||||
eligibility: &store.TaskEligibility{MemberStatus: 1, AutoDispatch: 1, HallEligible: true, AvailableAmount: 29899, WalletStatus: 1, DailyLimit: 5, TodayCount: 2}}
|
||||
service := New(repository)
|
||||
service.now = func() time.Time { return time.Date(2026, 10, 9, 10, 0, 0, 0, shanghai) }
|
||||
|
||||
result, err := service.Eligibility(context.Background(), 0, 10, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result.Eligible || result.Reason != "INSUFFICIENT_BALANCE" || result.MinimumAmount != 50000 {
|
||||
if result.Eligible || result.Reason != "INSUFFICIENT_BALANCE" || result.MinimumAmount != 29900 {
|
||||
t.Fatalf("unexpected eligibility: %#v", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEligibilityAllowsManualDispatchBelowMinimumBalance(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":true},"task_minimum_amount":50000,"task_business_start_at":"09:00","task_business_end_at":"22:00"}`),
|
||||
eligibility: &store.TaskEligibility{MemberStatus: 1, AutoDispatch: 2, HallEligible: true, AvailableAmount: 0, WalletStatus: 1, DailyLimit: 5}}
|
||||
func TestEligibilityAlsoRequiresMinimumForManualDispatch(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":true}}`),
|
||||
eligibility: &store.TaskEligibility{MemberStatus: 1, AutoDispatch: 2, HallEligible: true, AvailableAmount: 29899, WalletStatus: 1, DailyLimit: 5}}
|
||||
service := New(repository)
|
||||
service.now = func() time.Time { return time.Date(2026, 10, 9, 10, 0, 0, 0, shanghai) }
|
||||
|
||||
result, err := service.Eligibility(context.Background(), 0, 10, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !result.Eligible {
|
||||
t.Fatalf("manual dispatch should ignore the automatic minimum balance gate: %#v", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEligibilityRejectsAutoDispatchWithZeroBalanceWhenMinimumIsZero(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":true},"task_minimum_amount":0,"task_business_start_at":"09:00","task_business_end_at":"22:00"}`),
|
||||
eligibility: &store.TaskEligibility{MemberStatus: 1, AutoDispatch: 1, HallEligible: true, AvailableAmount: 0, WalletStatus: 1, DailyLimit: 5}}
|
||||
service := New(repository)
|
||||
service.now = func() time.Time { return time.Date(2026, 10, 9, 10, 0, 0, 0, shanghai) }
|
||||
|
||||
result, err := service.Eligibility(context.Background(), 0, 10, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result.Eligible || result.Reason != "INSUFFICIENT_BALANCE" {
|
||||
t.Fatalf("zero balance must not allow automatic claiming: %#v", result)
|
||||
t.Fatalf("manual dispatch must use the same minimum balance gate: %#v", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClaimFailsClosedWithoutTaskSwitch(t *testing.T) {
|
||||
func TestEligibilityDoesNotEnforceDisplayedBusinessHours(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":true},"task_business_start_at":"09:00","task_business_end_at":"21:00"}`),
|
||||
eligibility: &store.TaskEligibility{MemberStatus: 1, AutoDispatch: 1, HallEligible: true, AvailableAmount: 29900, WalletStatus: 1, DailyLimit: 5}}
|
||||
service := New(repository)
|
||||
service.now = func() time.Time { return time.Date(2026, 10, 9, 23, 0, 0, 0, time.FixedZone("Asia/Shanghai", 8*60*60)) }
|
||||
|
||||
result, err := service.Eligibility(context.Background(), 0, 10, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !result.Eligible || result.BusinessStartAt != "09:00:00+08:00" || result.BusinessEndAt != "21:00:00+08:00" {
|
||||
t.Fatalf("business hours are display-only: %#v", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClaimDefaultsToEnabledWithoutTaskSwitch(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{}`)}
|
||||
service := New(repository)
|
||||
service.now = func() time.Time { return time.Date(2026, 10, 9, 2, 0, 0, 0, time.UTC) }
|
||||
|
||||
if _, err := service.Claim(context.Background(), 0, 10, 1); err != nil {
|
||||
t.Fatalf("missing switch should default to enabled, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClaimHonorsExplicitDisabledTaskSwitch(t *testing.T) {
|
||||
repository := &fakeRepository{config: json.RawMessage(`{"features":{"task_enabled":false}}`)}
|
||||
service := New(repository)
|
||||
|
||||
_, err := service.Claim(context.Background(), 0, 10, 1)
|
||||
if !errors.Is(err, ErrTaskDisabled) {
|
||||
t.Fatalf("expected task disabled, got %v", err)
|
||||
t.Fatalf("expected explicitly disabled task, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +136,7 @@ func TestClaimBuildsMatchingOrder(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result.Status != "matching" || repository.claimed.HallID != 2 ||
|
||||
!repository.claimed.DeadlineAt.Equal(now.Add(20*time.Minute)) {
|
||||
repository.claimed.MinimumAmount != 29900 || !repository.claimed.DeadlineAt.Equal(now.Add(20*time.Minute)) {
|
||||
t.Fatalf("unexpected claim: result=%#v input=%#v", result, repository.claimed)
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
|
||||
/>
|
||||
<meta name="theme-color" content="#ffffff" />
|
||||
<title>Olons</title>
|
||||
<title>悦选</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 360" role="img" aria-label="悦选平台横幅">
|
||||
<defs><linearGradient id="g" x1="0" x2="1"><stop stop-color="#1ba8ee"/><stop offset="1" stop-color="#3136dc"/></linearGradient></defs>
|
||||
<rect width="1200" height="360" rx="28" fill="url(#g)"/>
|
||||
<circle cx="1010" cy="70" r="180" fill="#fff" opacity=".10"/><circle cx="1120" cy="320" r="220" fill="#fff" opacity=".08"/>
|
||||
<text x="90" y="160" fill="#fff" font-size="66" font-family="PingFang SC, Microsoft YaHei, sans-serif" font-weight="700">悦选</text>
|
||||
<text x="92" y="230" fill="#fff" font-size="34" font-family="PingFang SC, Microsoft YaHei, sans-serif" opacity=".9">精选商品 · 安心服务</text>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 727 B |
@@ -0,0 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800" role="img" aria-label="悦选商品占位图">
|
||||
<defs><linearGradient id="g" x1="0" y1="0" x2="1" y2="1"><stop stop-color="#eaf7ff"/><stop offset="1" stop-color="#dfe3ff"/></linearGradient></defs>
|
||||
<rect width="800" height="800" rx="48" fill="url(#g)"/>
|
||||
<path d="M220 300h360l-28 300H248z" fill="#fff" stroke="#2878e8" stroke-width="22"/>
|
||||
<path d="M310 315c0-118 180-118 180 0" fill="none" stroke="#2878e8" stroke-width="22" stroke-linecap="round"/>
|
||||
<text x="400" y="690" text-anchor="middle" fill="#2878e8" font-size="54" font-family="PingFang SC, Microsoft YaHei, sans-serif" font-weight="700">悦选</text>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 687 B |
@@ -13,7 +13,7 @@ const reasonMessages: Record<string, string> = {
|
||||
RATE_LIMITED: '操作过于频繁，请稍后再试',
|
||||
TASK_DISABLED: '领取功能暂未开放',
|
||||
OUTSIDE_BUSINESS_HOURS: '当前不在营业时间内',
|
||||
INSUFFICIENT_BALANCE: '可用余额不足',
|
||||
INSUFFICIENT_BALANCE: '可用余额不足299元，暂时无法领取',
|
||||
DAILY_LIMIT_REACHED: '今日领取次数已用完',
|
||||
PENDING_ORDER_EXISTS: '存在未完成的任务，请先处理',
|
||||
NO_TASK_AVAILABLE: '当前暂无可领取任务',
|
||||
|
||||
@@ -38,7 +38,7 @@ export class CustomerServiceChat {
|
||||
this.currentUserID = session.current_user_id;
|
||||
this.onMessages = onMessages;
|
||||
this.tinode = new Tinode({
|
||||
appName: 'Olons Web',
|
||||
appName: '悦选',
|
||||
host: endpoint.host,
|
||||
apiKey: session.api_key,
|
||||
transport: 'ws',
|
||||
|
||||
+45
-139
@@ -3543,105 +3543,40 @@ body {
|
||||
/* Olons 2 manual task mall */
|
||||
.m-task-mall {
|
||||
min-height: 100dvh;
|
||||
padding: calc(18px + env(safe-area-inset-top)) 20px 32px;
|
||||
padding: 0 12px 32px;
|
||||
background-color: #fffaf4;
|
||||
background-size: 100% auto;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.m-mall-search {
|
||||
display: grid;
|
||||
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
}
|
||||
.m-mall-search h1 {
|
||||
margin: 0;
|
||||
font-size: 28px;
|
||||
}
|
||||
.m-mall-search label {
|
||||
height: 48px;
|
||||
min-width: 0;
|
||||
padding: 0 14px;
|
||||
border-radius: 25px;
|
||||
background: #fff;
|
||||
color: #aaa;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
.m-mall-search label .n-icon {
|
||||
font-size: 24px;
|
||||
}
|
||||
.m-mall-search input {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
border: 0;
|
||||
outline: 0;
|
||||
background: transparent;
|
||||
}
|
||||
.m-mall-search > button,
|
||||
.m-mall-claim {
|
||||
border: 0;
|
||||
color: #fff;
|
||||
background: #ff8b16;
|
||||
}
|
||||
.m-mall-search > button {
|
||||
min-width: 72px;
|
||||
height: 48px;
|
||||
border-radius: 25px;
|
||||
font-size: 17px;
|
||||
.m-task-mall > .m-page-header {
|
||||
margin-inline: -2px;
|
||||
}
|
||||
.m-mall-banner {
|
||||
display: block;
|
||||
width: 100%;
|
||||
margin-top: 18px;
|
||||
margin: 0 0 12px;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.m-mall-tabs {
|
||||
min-height: 62px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 24px;
|
||||
}
|
||||
.m-mall-tabs button {
|
||||
min-height: 44px;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
font-size: 19px;
|
||||
}
|
||||
.m-mall-tabs button.active {
|
||||
color: #ff6d50;
|
||||
font-weight: 600;
|
||||
}
|
||||
.m-mall-tabs > .n-icon {
|
||||
margin-left: auto;
|
||||
font-size: 24px;
|
||||
}
|
||||
.m-mall-list {
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 10px 6px;
|
||||
}
|
||||
.m-mall-task {
|
||||
min-height: 128px;
|
||||
padding: 12px;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
display: grid;
|
||||
grid-template-columns: 104px minmax(0, 1fr) auto;
|
||||
gap: 12px;
|
||||
align-items: center;
|
||||
}
|
||||
.m-mall-cover {
|
||||
width: 104px;
|
||||
aspect-ratio: 1;
|
||||
padding: 0;
|
||||
min-width: 0;
|
||||
padding: 0 0 11px;
|
||||
border: 0;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
color: var(--m-ink);
|
||||
overflow: hidden;
|
||||
background: #f0f0f0;
|
||||
position: relative;
|
||||
text-align: left;
|
||||
}
|
||||
.m-mall-cover {
|
||||
display: grid;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
background: #f0f0f0;
|
||||
place-items: center;
|
||||
}
|
||||
.m-mall-cover img {
|
||||
@@ -3653,45 +3588,22 @@ body {
|
||||
color: #bbb;
|
||||
font-size: 38px;
|
||||
}
|
||||
.m-mall-cover span {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
padding: 4px;
|
||||
background: rgba(109, 48, 11, 0.88);
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
}
|
||||
.m-mall-task > div {
|
||||
min-width: 0;
|
||||
}
|
||||
.m-mall-task h2 {
|
||||
.m-mall-task > strong {
|
||||
display: -webkit-box;
|
||||
margin: 0 0 7px;
|
||||
min-height: 2.5em;
|
||||
margin: 8px 10px 3px;
|
||||
overflow: hidden;
|
||||
font-size: 17px;
|
||||
line-height: 1.35;
|
||||
font-size: clamp(15px, 4.3vw, 19px);
|
||||
font-weight: 600;
|
||||
line-height: 1.22;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-line-clamp: 3;
|
||||
}
|
||||
.m-mall-task strong {
|
||||
.m-mall-task > small {
|
||||
display: block;
|
||||
color: #ff684d;
|
||||
font-size: 21px;
|
||||
}
|
||||
.m-mall-task strong small {
|
||||
font-size: 14px;
|
||||
}
|
||||
.m-mall-task p {
|
||||
margin: 5px 0 0;
|
||||
color: #b5b5b5;
|
||||
}
|
||||
.m-mall-claim {
|
||||
min-width: 66px;
|
||||
height: 38px;
|
||||
border-radius: 20px;
|
||||
font-size: 16px;
|
||||
margin: 0 10px;
|
||||
color: #555;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
/* Olons 2 leaderboard */
|
||||
@@ -3760,10 +3672,18 @@ body {
|
||||
.m-rank-winner > strong,
|
||||
.m-rank-winner > em {
|
||||
max-width: 100%;
|
||||
font-style: normal;
|
||||
}
|
||||
.m-rank-winner > strong {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-style: normal;
|
||||
}
|
||||
.m-rank-winner > em {
|
||||
overflow: visible;
|
||||
font-size: clamp(11px, 3vw, 14px);
|
||||
line-height: 1.2;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
.m-rank-winner > small {
|
||||
margin-top: 4px;
|
||||
@@ -3781,7 +3701,7 @@ body {
|
||||
.m-rank-table header,
|
||||
.m-rank-row {
|
||||
display: grid;
|
||||
grid-template-columns: 48px minmax(0, 1.5fr) minmax(82px, 1fr) 70px;
|
||||
grid-template-columns: 48px minmax(0, 1fr) max-content 70px;
|
||||
align-items: center;
|
||||
gap: 7px;
|
||||
}
|
||||
@@ -3823,6 +3743,7 @@ body {
|
||||
font-style: normal;
|
||||
}
|
||||
.m-rank-row strong {
|
||||
white-space: nowrap;
|
||||
font-size: 17px;
|
||||
font-weight: 500;
|
||||
}
|
||||
@@ -3849,7 +3770,7 @@ body {
|
||||
.m-home-rank-list a {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
grid-template-columns: 30px 34px minmax(0, 1fr) 72px 82px;
|
||||
grid-template-columns: 30px 34px minmax(0, 1fr) max-content 82px;
|
||||
align-items: center;
|
||||
gap: 7px;
|
||||
color: var(--m-ink);
|
||||
@@ -3895,14 +3816,16 @@ body {
|
||||
.m-home-rank-list strong,
|
||||
.m-home-rank-list em {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.m-home-rank-list strong {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
font-weight: 500;
|
||||
}
|
||||
.m-home-rank-list em {
|
||||
overflow: visible;
|
||||
font-size: clamp(12px, 3.2vw, 15px);
|
||||
font-style: normal;
|
||||
text-align: right;
|
||||
font-weight: 600;
|
||||
@@ -4017,36 +3940,19 @@ body {
|
||||
.m-leaderboard {
|
||||
padding-inline: 14px;
|
||||
}
|
||||
.m-mall-task {
|
||||
grid-template-columns: 92px minmax(0, 1fr) auto;
|
||||
gap: 9px;
|
||||
padding: 10px;
|
||||
}
|
||||
.m-mall-cover {
|
||||
width: 92px;
|
||||
}
|
||||
.m-mall-search {
|
||||
gap: 8px;
|
||||
}
|
||||
.m-mall-search h1 {
|
||||
font-size: 23px;
|
||||
}
|
||||
.m-mall-search > button {
|
||||
min-width: 60px;
|
||||
}
|
||||
.m-claim-result {
|
||||
padding-inline: 20px;
|
||||
}
|
||||
.m-rank-table header,
|
||||
.m-rank-row {
|
||||
grid-template-columns: 38px minmax(0, 1.4fr) 72px 58px;
|
||||
grid-template-columns: 38px minmax(0, 1fr) max-content 58px;
|
||||
gap: 5px;
|
||||
}
|
||||
.m-rank-table {
|
||||
padding-inline: 8px;
|
||||
}
|
||||
.m-home-rank-list a {
|
||||
grid-template-columns: 26px 32px minmax(0, 1fr) 54px 72px;
|
||||
grid-template-columns: 26px 32px minmax(0, 1fr) max-content 68px;
|
||||
gap: 5px;
|
||||
}
|
||||
.m-home-rank-list small {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<img :src="mobileAssets.claimMachine" alt="每日参与任务，赚取更多佣金" />
|
||||
<button
|
||||
type="button"
|
||||
:disabled="claiming || !eligibleHalls.length"
|
||||
:disabled="claiming || !halls.length"
|
||||
aria-label="自动领取任务"
|
||||
@click="claim"
|
||||
>
|
||||
@@ -22,21 +22,22 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div v-if="halls.length && !eligibleHalls.length && eligibility?.eligible === false" class="m-claim2-warning">
|
||||
<div v-if="balanceInsufficient" class="m-claim2-warning">
|
||||
<n-icon :component="AlertCircleOutline" />
|
||||
<span>{{ eligibility.message || '暂不满足领取条件' }}</span>
|
||||
<button v-if="eligibility.pending_order_id" type="button" @click="openPendingOrder">查看任务</button>
|
||||
<span>可用余额不足299元</span>
|
||||
</div>
|
||||
|
||||
<section class="m-claim2-rules">
|
||||
<h2><span></span>活动规则<span></span></h2>
|
||||
<ol>
|
||||
<li>平台运营时间每天 {{ businessHours }}。</li>
|
||||
<li>每一次储入请先咨询客服获取商家卡号，如有疑问请联系在线客服。</li>
|
||||
<li>领取后系统将自动分配任务，请按订单要求完成任务内容。</li>
|
||||
<li>领取时间根据会员等级不同，系统随机匹配订单。</li>
|
||||
<li>账户可用余额需达到 {{ money(eligibility?.minimum_amount) }} 才可领取。</li>
|
||||
<li>订单需要在规定时间内完成，请勿超时提交。</li>
|
||||
<li>平台运营时间每天上午9:00-晚上21:00点！</li>
|
||||
<li>每一次储入必须咨询客户获取商家卡号！如有不理解可联系在线客服！</li>
|
||||
<li>领取后系统将自动分配任务，请按订单要求完成任务内容！</li>
|
||||
<li>领取订单的时间是根据会员等级的不同！系统随机匹配订单！</li>
|
||||
<li>会员账户必须要拥有299启动资金才可进行领取！</li>
|
||||
<li>订单需要在规定时间内完成！请勿超时完成商品！</li>
|
||||
<li>平台硬性条件提现必须信用分值满足100分，请广大会员珍惜账户信用分值！信用分下降必须联系客服处理恢复100分才可正常提现，信用分提升金额具体根据会员等级规定，详细咨询平台客服。</li>
|
||||
<li>非本人充值资金需要提供支付人身份证信息验证充值资金，避免出现非必要的资金纠纷。</li>
|
||||
</ol>
|
||||
</section>
|
||||
</div>
|
||||
@@ -132,11 +133,12 @@
|
||||
const eligibleHalls = computed(() =>
|
||||
halls.value.filter((hall) => eligibilityByHall.value[hall.id]?.eligible)
|
||||
);
|
||||
const businessHours = computed(() => {
|
||||
const start = String(eligibility.value?.business_start_at || '09:00').slice(0, 5);
|
||||
const end = String(eligibility.value?.business_end_at || '21:00').slice(0, 5);
|
||||
return `${start}-${end}`;
|
||||
});
|
||||
const balanceInsufficient = computed(() =>
|
||||
Object.values(eligibilityByHall.value).some((item: any) =>
|
||||
Number(item?.minimum_amount || 0) > 0 &&
|
||||
Number(item?.available_amount || 0) < Number(item.minimum_amount)
|
||||
)
|
||||
);
|
||||
const isAutoMatching = computed(() => order.value?.dispatch_mode !== 'manual');
|
||||
const matchingHint = computed(() => {
|
||||
if (order.value?.dispatch_mode === 'manual') return '订单已领取，正在等待后台匹配...';
|
||||
@@ -202,12 +204,12 @@
|
||||
if (claiming.value || !halls.value.length) return;
|
||||
claiming.value = true;
|
||||
pollFinished.value = false;
|
||||
order.value = undefined;
|
||||
try {
|
||||
await loadEligibilities();
|
||||
const candidates = eligibleHalls.value;
|
||||
if (!candidates.length) {
|
||||
window.$message.warning(eligibility.value?.message || '暂不满足领取条件');
|
||||
return;
|
||||
throw new Error(eligibility.value?.message || '暂不满足领取条件');
|
||||
}
|
||||
openMatching();
|
||||
let stockError: unknown;
|
||||
@@ -348,10 +350,6 @@
|
||||
closeResult();
|
||||
router.push('/app/orders');
|
||||
}
|
||||
function openPendingOrder() {
|
||||
const orderID = Number(eligibility.value?.pending_order_id || 0);
|
||||
router.push(orderID > 0 ? `/app/orders/${orderID}` : '/app/orders');
|
||||
}
|
||||
function retryClaim() {
|
||||
closeResult();
|
||||
void claim();
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
<i v-else>{{ entry.username.slice(0, 1) }}</i>
|
||||
</span>
|
||||
<strong>{{ entry.username }}</strong>
|
||||
<em>{{ formatCount(entry.completed_count) }}</em>
|
||||
<em>{{ formatPoints(entry.claimed_points) }}积分</em>
|
||||
<small>{{ entry.status || '领取成功' }}</small>
|
||||
</router-link>
|
||||
</div>
|
||||
@@ -139,7 +139,7 @@
|
||||
rank: number;
|
||||
username: string;
|
||||
avatar_url: string;
|
||||
completed_count: number;
|
||||
claimed_points: number;
|
||||
status: string;
|
||||
}
|
||||
const router = useRouter();
|
||||
@@ -150,7 +150,10 @@
|
||||
const popupNotice = ref<AnnouncementNotice | null>(null);
|
||||
const activeBannerIndex = ref(0);
|
||||
let bannerTimer: number | undefined;
|
||||
const formatCount = (value: number) => new Intl.NumberFormat('zh-CN').format(value || 0);
|
||||
const formatPoints = (value: number) =>
|
||||
new Intl.NumberFormat('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(
|
||||
(value || 0) / 100
|
||||
);
|
||||
const currentBanner = computed(() => home.value?.banners?.[activeBannerIndex.value]);
|
||||
const bannerStyle = computed(() => {
|
||||
const url = safeImage(currentBanner.value?.image_url);
|
||||
@@ -180,7 +183,7 @@
|
||||
enabled: home.value?.features?.withdrawal_enabled === true,
|
||||
},
|
||||
{
|
||||
label: '商城',
|
||||
label: '手工',
|
||||
path: '/app/mall',
|
||||
icon: mobileAssets.shortcutMall,
|
||||
enabled: home.value?.features?.manual_mall_enabled !== false,
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
</div>
|
||||
<b>{{ entry.rank }}</b>
|
||||
<strong>{{ entry.username }}</strong>
|
||||
<em>{{ number(entry.completed_count) }}</em>
|
||||
<em>{{ points(entry.claimed_points) }} 积分</em>
|
||||
<small>{{ entry.status }}</small>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
<section v-if="remaining.length" class="m-rank-table">
|
||||
<header><span>排名</span><span>用户昵称</span><span>领取数量</span><span>状态</span></header>
|
||||
<header><span>排名</span><span>用户昵称</span><span>领取积分</span><span>状态</span></header>
|
||||
<div v-for="entry in remaining" :key="entry.rank" class="m-rank-row">
|
||||
<b>{{ entry.rank }}</b>
|
||||
<div class="m-rank-user">
|
||||
@@ -38,7 +38,7 @@
|
||||
</span>
|
||||
<span>{{ entry.username }}</span>
|
||||
</div>
|
||||
<strong>{{ number(entry.completed_count) }}</strong>
|
||||
<strong>{{ points(entry.claimed_points) }}</strong>
|
||||
<em>{{ entry.status.replace('成功', '') }}</em>
|
||||
</div>
|
||||
</section>
|
||||
@@ -57,7 +57,7 @@
|
||||
rank: number;
|
||||
username: string;
|
||||
avatar_url: string;
|
||||
completed_count: number;
|
||||
claimed_points: number;
|
||||
status: string;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,10 @@
|
||||
const error = ref('');
|
||||
const podium = computed(() => [entries.value[2], entries.value[0], entries.value[1]].filter(Boolean));
|
||||
const remaining = computed(() => entries.value.slice(3));
|
||||
const number = (value: number) => new Intl.NumberFormat('zh-CN').format(value || 0);
|
||||
const points = (value: number) =>
|
||||
new Intl.NumberFormat('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(
|
||||
(value || 0) / 100
|
||||
);
|
||||
const podiumBackground = (rank: number) =>
|
||||
rank === 1 ? mobileAssets.rankFirst : rank === 2 ? mobileAssets.rankSecond : mobileAssets.rankThird;
|
||||
|
||||
|
||||
@@ -1,40 +1,25 @@
|
||||
<template>
|
||||
<section v-if="!isDetail" class="m-task-mall" :style="{ backgroundImage: `url(${mobileAssets.mallBackground})` }">
|
||||
<header class="m-mall-search">
|
||||
<h1>商城</h1>
|
||||
<label><n-icon :component="SearchOutline" /><input v-model.trim="keyword" placeholder="搜索商品" /></label>
|
||||
<button type="button" @click="applySearch">搜索</button>
|
||||
</header>
|
||||
<PageHeader title="手工商城" />
|
||||
|
||||
<img class="m-mall-banner" :src="mobileAssets.mallBanner" alt="精选任务，轻松赚收益" />
|
||||
|
||||
<div class="m-mall-tabs">
|
||||
<button :class="{ active: tab === 'recommended' }" @click="tab = 'recommended'">推荐任务</button>
|
||||
<button :class="{ active: tab === 'limited' }" @click="tab = 'limited'">限时任务</button>
|
||||
<n-icon :component="ChevronForwardOutline" />
|
||||
</div>
|
||||
|
||||
<AsyncState
|
||||
:loading="loading"
|
||||
:error="error"
|
||||
:empty="!visibleProducts.length"
|
||||
:empty-text="tab === 'limited' ? '暂无限时任务' : '暂无推荐任务'"
|
||||
:empty="!products.length"
|
||||
empty-text="暂无手工商品"
|
||||
@retry="loadList"
|
||||
>
|
||||
<div class="m-mall-list">
|
||||
<article v-for="item in visibleProducts" :key="item.id" class="m-mall-task">
|
||||
<button class="m-mall-cover" @click="openProduct(item.id)">
|
||||
<button v-for="item in products" :key="item.id" class="m-mall-task" type="button" @click="openSupport">
|
||||
<span class="m-mall-cover">
|
||||
<img v-if="safeImage(item.cover_url)" :src="safeImage(item.cover_url)" :alt="item.name" />
|
||||
<n-icon v-else :component="ImageOutline" />
|
||||
<span v-if="item.is_limited">限时展示</span>
|
||||
</button>
|
||||
<div>
|
||||
<h2>{{ item.name }}</h2>
|
||||
<strong>{{ money(item.price_amount, item.currency) }}<small>/件</small></strong>
|
||||
<p>已领取{{ item.claimed_count || 0 }}</p>
|
||||
</div>
|
||||
<button class="m-mall-claim" @click="openProduct(item.id)">{{ tab === 'limited' ? '抢单' : '领取' }}</button>
|
||||
</article>
|
||||
</span>
|
||||
<strong>{{ item.name }}</strong>
|
||||
<small>已领取：{{ item.claimed_count || 0 }}</small>
|
||||
</button>
|
||||
</div>
|
||||
</AsyncState>
|
||||
</section>
|
||||
@@ -76,7 +61,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { ChevronForwardOutline, ImageOutline, SearchOutline } from '@vicons/ionicons5';
|
||||
import { ImageOutline } from '@vicons/ionicons5';
|
||||
import PageHeader from '../components/PageHeader.vue';
|
||||
import AsyncState from '../components/AsyncState.vue';
|
||||
import { errorText, money, request, safeImage } from '../api';
|
||||
@@ -89,29 +74,10 @@
|
||||
const error = ref('');
|
||||
const products = ref<any[]>([]);
|
||||
const product = ref<any>();
|
||||
const keyword = ref('');
|
||||
const submittedKeyword = ref('');
|
||||
const tab = ref<'recommended' | 'limited'>('recommended');
|
||||
let listController: AbortController | undefined;
|
||||
|
||||
const isLimited = (item: any) => item.is_limited === true;
|
||||
const visibleProducts = computed(() => {
|
||||
let items = products.value;
|
||||
if (tab.value === 'limited') {
|
||||
items = items.filter(isLimited);
|
||||
} else {
|
||||
const recommended = items.filter((item) => item.is_recommended && !isLimited(item));
|
||||
items = recommended.length ? recommended : items.filter((item) => !isLimited(item));
|
||||
}
|
||||
const query = submittedKeyword.value.toLocaleLowerCase('zh-CN');
|
||||
return query ? items.filter((item) => String(item.name || '').toLocaleLowerCase('zh-CN').includes(query)) : items;
|
||||
});
|
||||
|
||||
function applySearch() {
|
||||
submittedKeyword.value = keyword.value;
|
||||
}
|
||||
function openProduct(id: number) {
|
||||
router.push(`/app/mall/${id}`);
|
||||
function openSupport() {
|
||||
router.push({ name: 'MobileSupport' });
|
||||
}
|
||||
async function loadList() {
|
||||
listController?.abort();
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<AsyncState :loading="loading" :error="error" :empty="!intro" empty-text="暂无平台介绍" @retry="load">
|
||||
<template v-if="intro">
|
||||
<header class="m-platform-intro-head">
|
||||
<span>YUEXUANLI</span>
|
||||
<span>悦选</span>
|
||||
<h2>{{ intro.title }}</h2>
|
||||
<p>{{ intro.summary }}</p>
|
||||
<div><b>01</b><small>服务条款</small><i></i><b>02</b><small>常见问题</small></div>
|
||||
|
||||
@@ -4,245 +4,135 @@ export interface PlatformIntroSection {
|
||||
}
|
||||
|
||||
export const platformIntroLead =
|
||||
'本协议阐述之条款和条件适用于您使用本网站所提供的各种工具和服务（下称“服务”）。';
|
||||
'欢迎使用悦选。请在使用服务前阅读以下条款，特别留意充值、订单、账户限制与提现规则。';
|
||||
|
||||
export const platformIntroSections: PlatformIntroSection[] = [
|
||||
{
|
||||
title: '一、接受条款',
|
||||
title: '一、服务与协议',
|
||||
paragraphs: [
|
||||
'通过《涛声》或 APP 进入即表示您同意自己已经与《涛声》（简称公司）订立本协议，且您将受本协议的条款和条件（“条款”）约束。公司可随时自行全权决定更改“条款”。如您不同意相关变更，必须停止使用“服务”。经修订的“条款”一经网站公布，立即自动生效。您应在第一次登录后仔细阅读修订后的“条款”，并有权选择停止继续使用“服务”；一旦您继续使用“服务”，则表示您已接受经修订的“条款”。当您与公司发生争议时，应以最新的服务协议为准。除另行明确声明外，任何使“服务”范围扩大或功能增强的新内容均受本协议约束。除非经公司的授权高层管理人员签订书面协议，本协议不得另行作出修订。',
|
||||
'悦选通过网站和 APP 提供相关服务。注册或使用服务前，请阅读并理解本协议；如不同意，请停止使用。服务内容或条款发生变更时，平台将在页面公布，您可选择是否继续使用。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二、谁可使用本网站',
|
||||
title: '二、使用资格',
|
||||
paragraphs: [
|
||||
'“服务”仅供能够根据相关法律订立具有法律约束力的合约的个人或公司使用。因此，您的年龄必须在十八周岁或以上，才可使用本公司服务。如不符合本项条件，请勿使用“服务”。公司可随时自行全权决定拒绝向任何人士提供“服务”。“服务”不会提供给被暂时或永久中止资格的会员。',
|
||||
'使用者须年满 18 周岁，并具备相应的民事行为能力。被暂停或终止使用资格的账户不得继续使用服务。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '三、收费',
|
||||
title: '三、费用与充值',
|
||||
paragraphs: [
|
||||
'本公司承诺不会收取平台用户的任何费用，无需押金，无需保证金，并且不会以任何方式联系用户索要任何费用。本公司联系方式请认准在线客服。用户需要自行充值到平台里面，方可进行代购。',
|
||||
'平台不收取注册费、押金或保证金。参与需要支付的订单前，账户须有足够可用余额；充值是向账户存入资金，并非平台收取的服务费。请仅通过页面展示的官方流程操作，谨防冒名索款。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '四、您的资料和提供买卖的物品',
|
||||
title: '四、注册资料与账户安全',
|
||||
paragraphs: [
|
||||
'“您的资料”包括您在注册、交易或列举物品过程中，在任何公开信息场合或通过任何电子邮件形式，向本公司或其他用户提供的任何资料，包括数据、文本、软件、音乐、声响、照片、图画、影像、词句或其他材料。您应对“您的资料”真实性负全部责任，而本公司仅作为您在网上发布和刊登“您的资料”的被动渠道。',
|
||||
'但是，倘若本公司认为您的信息可能使本公司承担任何法律或道义上的责任，或可能使本公司（全部或部分地）失去本公司的互联网服务供应商或其他供应商的服务，或您未在公司规定的期限内登录或再次登录网站，则本公司可自行全权决定对您的信息采取本公司认为必要或适当的任何行动，包括但不限于删除该类资料。您特此保证，您对提交的资料拥有全部权利，包括全部版权。您确认，网站没有责任去认定或决定您提交给本公司的信息哪些是应当受到保护的；对享有“服务”的其他用户使用您的信息，本公司也不必负责。',
|
||||
'注册时请提供真实、准确、完整的资料，并在信息变化后及时更新。请妥善保管账户和密码；发现未经授权的登录或操作时，及时修改密码并联系客服。',
|
||||
'如资料无法核实，或账户存在违规、欺诈风险，平台可按规则采取核验、限制或终止服务等措施。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '五、注册义务',
|
||||
title: '五、信息与内容规范',
|
||||
paragraphs: [
|
||||
'如您在公司网站注册，您必须同意：',
|
||||
'（一）根据公司网址所刊载的会员信息表格的要求，提供关于您或贵公司的真实、准确、完整和反映当前情况的信息；',
|
||||
'（二）维持并及时更新会员资料，使其保持真实、准确、完整和反映当前情况。倘若您提供任何不真实、不准确、不完整或不能反映当前情况的信息，或公司有合理理由怀疑该类资料不真实、不准确、不完整或不能反映当前情况的，公司有权暂停或终止您的注册身份及信息，并拒绝您在目前或将来对“服务”（或其任何部分）任何形式的使用。如您代表一家公司或其他法律主体在本公司登记，则您必须声明和保证，您有权使该公司或其他法律主体受本协议“条款”约束。',
|
||||
'您应对提交、发布的信息负责，不得提供虚假或侵权内容，不得发布违法、有害、骚扰性信息，或利用服务发送垃圾信息、收集他人资料、传播恶意程序。平台可依法处理违规内容。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '六、会员注册名、密码和保密',
|
||||
title: '六、禁止交易的物品',
|
||||
paragraphs: [
|
||||
'登记过程中，您将选择会员注册名和密码。您须自行负责对您的会员注册名和密码保密，且须对您在会员注册名和密码下发生的所有活动承担责任。您同意：',
|
||||
'（一）如发现任何人未经授权使用您的会员注册名或密码，或发生违反保密规定的任何其他情况，您会立即通知公司；',
|
||||
'（二）确保您在每个上网时段结束时，以正确步骤离开网站。网站不能也不会对因您未能遵守本款规定而发生的任何损失或损毁负责。',
|
||||
'不得通过平台发布或交易法律法规禁止的物品，以及平台规则明确不支持的物品。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '七、关于您的信息的规则',
|
||||
title: '七、您提交的资料',
|
||||
paragraphs: [
|
||||
'您同意，您的个人信息和您提供在公司网站上交易的任何“资料”（泛指一切可供依法交易的、有形的或无形的、以各种形态存在的某种具体物品、权利、利益、票据、证券、服务或行为。本协议中“物品”一词均含此义）：',
|
||||
'（一）不会有欺诈成分，与售卖伪造或盗窃无涉；',
|
||||
'（二）不会侵犯任何第三者对该物品享有的物权，或版权、专利、商标、商业秘密或其他知识产权、隐私权、名誉权；',
|
||||
'（三）不会违反任何法律、法规、条例或规章，包括但不限于关于规范出口管理、贸易配额、保护消费者、不正当竞争或虚假广告的法律、法规、条例或规章；',
|
||||
'（四）不会含有诽谤（包括商业诽谤）、非法恐吓或非法骚扰的内容；',
|
||||
'（五）不会含有淫秽或任何儿童色情内容；',
|
||||
'（六）不会含有蓄意毁坏、恶意干扰、秘密截取或侵占任何系统、数据或个人资料的病毒、伪装破坏程序、电脑蠕虫、定时程序炸弹或其他电脑程序；',
|
||||
'（七）不会直接或间接与下述各项货物或服务连接，或包含对下述各项货物或服务的描述：1. 本协议项下禁止的货物或服务；2. 您无权连接或包含的货物或服务；',
|
||||
'（八）不会含有诽谤（包括商业诽谤）、非法恐吓或非法骚扰的内容；',
|
||||
'（九）不会在与任何连锁信件、大量胡乱邮寄的电子邮件、滥发电子邮件或任何复制或多余的信息有关的方面使用“服务”；',
|
||||
'（十）不会未经其他人士同意，利用“服务”收集其他人士的电子邮件地址及其他信息；',
|
||||
'（十一）不会利用“服务”制作虚假的电子邮件地址，或以其他形式试图在发送人的身份或信息来源方面误导其他人士。',
|
||||
'您应确保有权提交相关文字、图片等资料，并允许平台在提供、展示和维护服务所必需的范围内使用。个人信息的处理以隐私政策为准；请勿在公开区域披露敏感信息。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '八、被禁止物品',
|
||||
title: '八、服务中断与账户限制',
|
||||
paragraphs: [
|
||||
'您不得在本公司网站公布或通过本公司网站买卖：',
|
||||
'（一）可能使本公司违反任何相关法律、法规、条例或规章的任何物品；',
|
||||
'（二）公司认为应禁止或不适合通过本网站买卖的任何物品。',
|
||||
'网络故障、系统维护或其他客观原因可能影响服务。平台将尽力恢复并处理异常。对违反协议、涉嫌欺诈或长期未使用的账户，平台可采取警告、限制或终止服务等措施；涉及账户资金的处理应以实际订单记录和适用规则为依据。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '九、您授予本公司的许可使用权',
|
||||
title: '九、订单规则',
|
||||
paragraphs: [
|
||||
'您授予本公司独家的、全球通用的、永久的、免费的许可使用权利（并有权在多个层面对该权利进行再授权），使本公司有权全部或部分地使用、复制、修订、改写、发布、翻译、分发、执行和展示“您的资料”或制作其派生作品，和/或以现在已知或日后开发的任何形式、媒体或技术，将“您的资料”纳入其他作品内。',
|
||||
'订单类型、金额、处理方式和期限以领取或匹配时的页面信息为准。自动模式仅匹配可用余额内的订单；手动模式可能匹配高于当前余额的订单，需由用户确认，并在余额足够后提交。',
|
||||
'原规则载明：普通订单可能高于账户本金余额，最多 2 个订单统一结算；促销联单、福利订单完成后统一返款，福利订单须在 3 小时内完成。团队任务须由相关成员共同完成。请在接受订单前核对金额、期限和结算条件。',
|
||||
'原规则还载明：违规可能涉及 50% 的违约金、风险金或信用分调整；信用分需在 25 小时内补齐。此类费用或限制须有明确适用条件与处理依据，遇到争议请先联系客服核实。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十、隐私',
|
||||
title: '十、提现与账户限制',
|
||||
paragraphs: [
|
||||
'尽管有第九条所规定的许可使用权，我们将仅根据本公司的隐私声明使用您提供的信息。本公司隐私声明的全部条款属于本协议的一部分，因此，您必须仔细阅读。请注意，您一旦自愿地在公司网站披露您的信息，该类资料即可能被其他人士获取和使用。',
|
||||
'原规则要求提现时信用分为 100 分，并要求账户完成与账户金额相对应的流水。一张银行卡不得绑定多个账户；重复注册或绑定可能导致账户限制、资金冻结 90 天或永久封号。请在充值和接单前确认提现条件。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十一、终止或访问限制',
|
||||
title: '十一、第三方内容与链接',
|
||||
paragraphs: [
|
||||
'您同意，在公司未向您收费的情况下，本公司可自行全权决定以任何理由，包括但不限于公司认为您已违反本协议的字面意义和精神，或您以不符合本协议字面意义和精神的方式行事，或您在超过 90 天的时间内未以您的账号及密码登录网站，终止您的“服务”密码、账户（或其任何部分）或您对“服务”的使用，并删除和丢弃您在使用“服务”中提交的信息。',
|
||||
'您同意，在公司向您收费的情况下，公司应基于合理的怀疑且经电子邮件通知的情况下实施上述终止服务的行为。公司同时可自行全权决定，在发出通知或不发出通知的情况下，随时停止提供“服务”或其任何部分。您同意，根据本协议的任何规定终止您使用“服务”之措施可在不发出事先通知的情况下实施，并承认和同意，公司可立即使您的账户无效，或撤销您的账户以及在您的账户内的所有相关资料和档案，和/或禁止您进一步接入该等档案或“服务”。',
|
||||
'账号终止后，公司没有义务为您保留原账号中或与之相关的任何信息，或转发任何未曾阅读或发送的信息给您或第三方。此外，您同意，公司不会就终止您接入“服务”而对您或任何第三者承担任何责任。第 12、13、14 和 22 条应在本协议终止后继续有效。',
|
||||
'第三方广告、网站或服务由相应提供方负责。访问外部链接、与第三方交易前，请自行核实信息和风险。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十二、违反规则会有什么后果？',
|
||||
title: '十二、法律适用与争议处理',
|
||||
paragraphs: [
|
||||
'在不限制其他补救措施的前提下，发生下述任一情况，本公司可立即发出警告，暂时终止、永久终止或终止您的会员资格，删除您的任何现有产品信息，以及您在网站上展示的任何其他资料：',
|
||||
'（一）您违反本协议；',
|
||||
'（二）本公司无法核实或鉴定您向本公司提供的任何资料；',
|
||||
'（三）本公司相信您的行为可能会使您、本公司用户或通过本公司或本公司网站提供服务的第三者服务供应商发生任何法律责任。在不限制任何其他补救措施的前提下，倘若发现您从事涉及本公司网站的诈骗活动，公司可暂停或终止您的账户。',
|
||||
'使用服务时应遵守适用法律法规。本协议适用中华人民共和国大陆地区法律；部分条款无效，不影响其他条款的效力。发生争议时，可先通过在线客服沟通。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十三、服务“按现状”提供',
|
||||
title: '十三、通知与其他事项',
|
||||
paragraphs: [
|
||||
'本公司会尽一切努力使您在使用公司网站的过程中得到良好体验。遗憾的是，本公司不能随时预见到任何技术上的问题或其他困难。该等困难可能会导致数据损失或其他服务中断。为此，您明确理解和同意，您使用“服务”的风险由您自行承担。“服务”以“按现状”和“按可得到”的基础提供。公司明确声明不作出任何种类的所有明示或暗示的保证，包括但不限于关于适销性、适用于某一特定用途和无侵权行为等方面的保证。',
|
||||
'公司对下述内容不作保证：（一）“服务”会符合您的要求；（二）“服务”不会中断，且适时、安全和不带任何错误；（三）通过使用“服务”而可能获取的结果将是准确或可信赖的；（四）您通过“服务”而购买或获取的任何产品、服务、资料或其他材料的质量将符合您的预期。',
|
||||
'通过使用“服务”而下载或以其他形式获取任何材料是由您自行全权决定进行的，且与此有关的风险由您自行承担。对于因您下载任何该等材料而发生的电脑系统损毁或数据损失，您将自行承担责任。您从公司或通过“服务”获取的任何口头或书面意见或资料，均不产生未在本协议内明确载明的任何保证。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十四、责任范围',
|
||||
paragraphs: [
|
||||
'您明确理解和同意，公司不对因下述任一情况而发生的任何损害赔偿承担责任，包括但不限于利润、商誉、使用、数据等方面的损失或其他无形损失的损害赔偿（无论公司是否已被告知该等损害赔偿的可能性）：',
|
||||
'（一）使用或未能使用“服务”；',
|
||||
'（二）因通过或从“服务”购买或获取任何货物、样品、数据、资料或服务，或通过或从“服务”接收任何信息或缔结任何交易所产生的获取替代货物和服务的费用；',
|
||||
'（三）未经批准接入或更改您的传输资料或数据；',
|
||||
'（四）任何第三者对“服务”的声明或关于“服务”的行为；',
|
||||
'（五）因任何原因而引起的与“服务”有关的其他事宜，包括疏忽。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十五、订单规则',
|
||||
paragraphs: [
|
||||
'（一）订单有多个类型，每一类型针对人群都有所不同。',
|
||||
'（二）普通订单为常规订单，普通订单偶尔有超出会员账户本金余额。平台最多 2 个订单统一结算，客户接取此类订单时需要注意规则。以上所有订单类型适用于个人与团队。（注：团队任务需要团队成员所有人完成任务，否则视为未完成任务。）',
|
||||
'（三）违规者自行承担后果，包括但不限于违约金 50%、风险金等。',
|
||||
'（四）促销联单和福利订单是统一完成后返款。',
|
||||
'（五）福利单需要在规定的三个小时内完成。',
|
||||
'（六）出现违规操作、超时等，可能导致信用分扣除。信用分需要在 25 小时之内补齐，如超过 25 小时没有补齐，会导致用户信用分再次下降。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十六、赔偿',
|
||||
paragraphs: [
|
||||
'您同意，因您违反本协议或经在此提及而纳入本协议的其他文件，或因您违反法律或侵害第三方权利，而使第三方对本公司及其子公司、分公司、董事、职员、代理人提出索赔要求（包括司法费用和其他专业人士的费用），您必须赔偿本公司及其子公司、分公司、董事、职员、代理人，使其免遭损失。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十七、遵守法律',
|
||||
paragraphs: ['您应遵守与您使用“服务条款”以及与您提供商贸信息有关的所有相关法律、法规、条例和规章。'],
|
||||
},
|
||||
{
|
||||
title: '十八、代理关系',
|
||||
paragraphs: [
|
||||
'您与本公司仅为独立订约人关系。本协议无意结成或创设任何代理、合伙、合营、雇用与被雇用或特许权授予与被授予关系。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '十九、广告和金融服务',
|
||||
paragraphs: [
|
||||
'您与在“服务”上或通过“服务”物色的刊登广告人士通讯、进行业务往来或参与其推广活动，包括就相关货物或服务付款和交付，以及与该等业务往来相关的任何其他条款、条件、保证或声明，仅限于在您和该刊登广告人士之间发生。您同意，对于因任何该等业务往来或因在“服务”上出现该等刊登广告人士而发生的任何种类的损失或损毁，本公司无需负责或承担任何责任。',
|
||||
'您如打算通过“服务”创设或参与与任何公司、股票行情、投资或证券有关的任何服务，或通过“服务”收取或要求与任何公司、股票行情、投资或证券有关的任何新闻信息、警戒性信息或其他资料，敬请注意，本公司不会就通过“服务”传送的任何该等资料的准确性、有用性、可用性或可获利性负责或承担任何责任，且不会对根据该等资料而作出的任何交易或投资决策负责或承担任何责任。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二十、链接',
|
||||
paragraphs: [
|
||||
'“服务”或第三者均可提供与其他万维网网站或资源的链接。由于本网站并不控制该等网站和资源，您承认并同意，本公司并不对该等外在网站或资源的可用性负责，且不认可该等网站或资源上或可从该等网站或资源获取的任何内容、宣传、产品、服务或其他材料，也不对其负责或承担任何责任。',
|
||||
'您进一步承认和同意，对于任何因使用或信赖从此类网站或资源上获取的内容、宣传、产品、服务或其他材料而造成或声称造成的任何直接或间接损失，本公司均不承担责任。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二十一、其他规定',
|
||||
paragraphs: [
|
||||
'本协议构成您和公司之间的全部协议，规定了您对“服务”的使用，并取代您和公司先前订立的任何书面或口头协议。本协议各方面应受中华人民共和国大陆地区法律的管辖。倘若本协议任何规定被裁定为无效或不可强制执行，该项规定应被撤销，而其余规定应予执行。条款标题仅为方便参阅而设，并不以任何方式界定、限制、解释或描述该条款的范围或限度。本公司未就您或其他人士的某项违约行为采取行动，并不表明本公司撤回就任何继后或类似的违约事件采取行动的权利。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二十二、通知',
|
||||
paragraphs: [
|
||||
'除非另有明确规定，任何通知应以电子邮件形式发送。就本公司而言，电子邮件地址为 dovekf@acca.com.cn；就您而言，发送到您在登记过程中向本公司提供的电子邮件地址，或有关方指明的其他地址。在电子邮件发出二十四（24）小时后，通知应被视为已送达，除非发送人被告知相关电子邮件地址已作废。',
|
||||
'或者，本公司可通过邮资预付挂号邮件并要求回执的方式，将通知发到您在登记过程中向本公司提供的地址。在该情况下，在付邮当日三（3）天后通知被视为已送达。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二十三、不可抗力',
|
||||
paragraphs: [
|
||||
'对于因本公司合理控制范围以外的原因，包括但不限于自然灾害、罢工或骚乱、物质短缺或定量配给、暴动、战争行为、政府行为、通讯或其他设施故障或严重伤亡事故等，致使本公司延迟或未能履约的，本公司不对您承担任何责任。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二十四、转让',
|
||||
paragraphs: ['本公司转让本协议无需经您同意。'],
|
||||
},
|
||||
{
|
||||
title: '二十五、其他规定',
|
||||
paragraphs: [
|
||||
'本协议构成您和本公司之间的全部协议，规定了您对“服务”的使用，并取代您和本公司先前订立的任何书面或口头协议。本协议各方面应受中华人民共和国大陆地区法律的管辖。倘若本协议任何规定被裁定为无效或不可强制执行，该项规定应被撤销，而其余规定应予执行。条款标题仅为方便参阅而设，并不以任何方式界定、限制、解释或描述该条款的范围或限度。本公司未就您或其他人士的某项违约行为采取行动，并不表明本公司撤回就任何继后或类似的违约事件采取行动的权利。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '二十六、平台提现要求',
|
||||
paragraphs: [
|
||||
'平台提现硬性要求信用分值为 100 分。',
|
||||
'温馨提示：同一个人银行卡信息请勿重复注册抢单，经发现将会冻结账号 ID。',
|
||||
'个人多账户代购会导致商家封店，影响商家信誉度以及销量单作废。本平台禁止一卡绑定多账户；一卡绑定多账户将给予资金冻结 90 天、账号永久封号处理。本平台为防止恶意洗钱或套现等不正当行为，兼职会员账户完成账户金额相对应的流水即可全额提款。',
|
||||
'平台可通过站内消息、页面公告或您登记的联系方式发送服务通知。因不可抗力造成服务延迟或中断时，平台将尽力减少影响。',
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
export const platformFAQs: PlatformIntroSection[] = [
|
||||
{
|
||||
title: '1. 关于充值',
|
||||
title: '1. 如何充值？',
|
||||
paragraphs: [
|
||||
'充值在“我的”—“我的钱包”界面进行。点击“充值”按钮，然后填写转账人的姓名和需转账的金额，点击去转账进行汇款充值。按照平台提供的账户汇款后，务必提交转账到账成功截图，然后点击“提交”即可。',
|
||||
'为保证充值快速到账，烦请您所填转账人姓名和汇款金额一定要和汇款时一致。如在充值过程中遇到无法解决的问题，请及时联系人工客服。由于充值信息量过大，充值前请务必仔细核对本平台的账户卡号。本平台不定期更换账号，每一次充值都需要跟客服获取商家卡号；充错卡号不予在平台上充值，后果自行负责。有不明白的问题可以咨询在线客服。',
|
||||
'进入“我的”→“我的钱包”→“充值”，填写付款人姓名和金额，按页面指引转账并上传成功凭证。付款姓名、金额应与提交信息一致。转账前务必核对当次页面展示的收款信息；有疑问先联系在线客服，切勿向来源不明的账户付款。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '2. 关于提现',
|
||||
title: '2. 如何提现？',
|
||||
paragraphs: [
|
||||
'在提现之前，烦请您先在 APP 绑定提现信息。在平台工作时间内，可在“我的”—“我的钱包”界面进行提现。点击“提现”按钮，输入您想要提现的金额和提现密码即可进行提现。21 点之前提现都是 0—5 分钟到账，繁忙高峰期 30 分钟内到账；21 点以后提现 T+1 到账。',
|
||||
'先绑定取出信息，再到“我的钱包”选择“提现”，填写金额和支付密码。原说明预计：21:00 前约 0—5 分钟到账，高峰期可能延至 30 分钟；21:00 后为次日到账。实际时间以银行处理和页面状态为准。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '3. 关于领取',
|
||||
title: '3. 如何领取订单？',
|
||||
paragraphs: [
|
||||
'在 APP 内完善好个人真实资料和真实收货地址，因为系统审核必须填写。客户需绑定自己可以接受短信、开通手机银行的银行卡，方便查收款项和对商家卡号进行转账。已经充值到账后，即可进行代购。在代购成功后，系统会根据客户会员等级的不同分配不同的拍单时间和金额，具体参考会员等级。正常会员系统会在 15—20 分钟内派单。',
|
||||
'完善真实资料和收款信息后，可在领取页查看订单。自动模式仅匹配可用余额内的订单；手动模式由客服匹配，用户需自行确认。原说明称正常会员约 15—20 分钟派单，具体以页面状态为准。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '4. 关于订单冻结',
|
||||
title: '4. 订单冻结后怎么办？',
|
||||
paragraphs: [
|
||||
'平台根据客户的账户金额和云数据派单，偶尔订单会出现大过账户本金的情况。客户只需补全账户负数，系统即可第一时间结算。订单未完成将被冻结，30 天自动解冻并扣除 30% 的违约金；继续完成未完成的商品或者订单，返本金到您绑定的账户银行卡内或平台账户内。未能理解的可以咨询在线客服。',
|
||||
'请先在订单详情核对冻结原因、待处理金额和期限，再联系在线客服。原规则载明：未完成订单 30 天后自动解冻，并可能扣除 30% 违约金；继续完成订单后返还本金。涉及扣款或冻结时，请先核实适用依据，不要仅凭口头要求转账。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '5. 关于代理',
|
||||
title: '5. 推荐奖励如何计算？',
|
||||
paragraphs: [
|
||||
'平台用户推荐新人即可成为平台代理，同时可以获得额外的动态奖励。直推一级用户奖励为一级用户每天所得佣金的 16%，二级用户奖励为二级用户每天所得佣金的 8%，三级用户奖励为三级用户每天所得佣金的 4%。（如您邀请的用户当日佣金是 100 元，您可以获取其佣金 16% 的奖励，即 16 元；二级为 8%。）详情可咨询在线客服。',
|
||||
'原规则按受邀用户当日佣金计算三级推荐奖励：一级 16%、二级 8%、三级 4%。奖励记录和到账情况请以账户页面为准。',
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '6. 大额返款',
|
||||
paragraphs: ['平台金额大于十五万时，统一返款至平台账户，方便会员自由运用资金。'],
|
||||
title: '6. 大额返款到哪里？',
|
||||
paragraphs: ['原规则载明，超过 15 万元的款项统一返至平台账户；具体以订单和账户记录为准。'],
|
||||
},
|
||||
{
|
||||
title: '7. 领取时间',
|
||||
paragraphs: ['平台运营时间为每天 9:00—21:00，用户在平台运营时间内均可进行代购。'],
|
||||
title: '7. 什么时候可以领取？',
|
||||
paragraphs: ['原规则载明，平台运营及领取时间为每日 9:00—21:00。'],
|
||||
},
|
||||
{
|
||||
title: '8. 订单超时',
|
||||
paragraphs: ['领取订单超出一个小时未能完成，系统即可认定超时，需通过超时冲单取代。'],
|
||||
title: '8. 订单超时怎么办？',
|
||||
paragraphs: [
|
||||
'原规则载明，领取后超过 1 小时未完成会被认定为超时。请在订单详情查看处理提示，并联系在线客服核实后续操作。',
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
@@ -208,7 +208,7 @@ window.addEventListener('vite:preloadError', (event) => {
|
||||
router.onError((error) => reloadAfterStaleChunk(error));
|
||||
|
||||
router.afterEach((route) => {
|
||||
document.title = route.meta.title ? `${String(route.meta.title)} - Olons` : 'Olons';
|
||||
document.title = route.meta.title ? `${String(route.meta.title)} - 悦选` : '悦选';
|
||||
});
|
||||
|
||||
export default router;
|
||||
|
||||
Reference in New Issue
Block a user