Test

See merge request !4

Develop

See merge request !3

Test

See merge request !2

# Conflicts:
#   miniprogram/api/fetch.js
#   miniprogram/api/fetch.ts

Develop

See merge request !1

# Conflicts:
#   miniprogram/api/fetch.js
#   miniprogram/api/fetch.ts