Skip to content

merge master #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 593 commits into from
Jan 16, 2020
Merged
Changes from 1 commit
Commits
Show all changes
593 commits
Select commit Hold shift + click to select a range
4321aee
Update submitsitemap.md
wenlixiu Jan 2, 2020
965c599
Update getTemplateList.md
MaWenChao0417 Jan 2, 2020
2839662
Update deleteTemplate.md
MaWenChao0417 Jan 2, 2020
8442f48
Update addTemplate.md
MaWenChao0417 Jan 2, 2020
648e80f
Update getTemplateLibraryById.md
MaWenChao0417 Jan 2, 2020
153fc56
Update getTemplateLibraryList.md
MaWenChao0417 Jan 2, 2020
10330cc
Merge pull request #808 from MaWenChao0417/patch-9
wenlixiu Jan 2, 2020
914209b
Merge pull request #810 from MaWenChao0417/patch-11
wenlixiu Jan 2, 2020
b3b017e
分支内容合并
Jan 2, 2020
1d53de3
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 2, 2020
9f220e4
图片更新
Jan 2, 2020
4b1c5cb
fix: 工具搜索隐藏底部
Jan 2, 2020
46c14bd
Merge pull request #816 from wlfsmile/master
wenlixiu Jan 2, 2020
9b5ce80
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 2, 2020
9b76e82
链接适配
Jan 2, 2020
6ef0eaa
fix: 工具搜索文档
Jan 2, 2020
f7a29ad
Merge pull request #817 from wlfsmile/master
wenlixiu Jan 2, 2020
0afd107
Update productlaboratory_ad.md
wenlixiu Jan 3, 2020
3bcfe06
Update submitresource.md
LYUyang-JK Jan 3, 2020
aa67112
更新目录
Jan 3, 2020
97ba103
Update sitemap.md
MaWenChao0417 Jan 3, 2020
e8591fd
gengxin
Jan 3, 2020
78ff79a
Merge branch 'master' into develop
Jan 3, 2020
e6b6a60
新增api
lok6666 Jan 3, 2020
64e129b
Merge pull request #818 from LYUyang-JK/patch-23
wenlixiu Jan 3, 2020
3c6f47d
修改live-player文档和textarea加上双绑说明
Jan 3, 2020
f20ac37
Merge pull request #15 from swan-team/master
wannamakeudance Jan 5, 2020
4cba53b
Update demo.md
sunbai01 Jan 6, 2020
a31efcc
示例小程序源码包路径修改
sunbai321 Jan 6, 2020
5bf92c1
Merge pull request #822 from naatgit/modify-live-player
wenlixiu Jan 6, 2020
d430366
Merge pull request #823 from sunbai01/patch-117
wenlixiu Jan 6, 2020
39aa380
Merge pull request #820 from lok6666/patch-1
wenlixiu Jan 6, 2020
b3e951b
格式更新
Jan 6, 2020
2258160
格式更新
Jan 6, 2020
ea4a91d
变更smtUI为smart-ui
jingxiangzheng Jan 6, 2020
565960c
Merge pull request #824 from wannamakeudance/master
wenlixiu Jan 6, 2020
4dcf9b2
格式更新
Jan 6, 2020
418786e
Update cardticket_new.md
Asadeer Jan 6, 2020
44024da
fix(subscribeService):修改最低版本号
huanhuana Jan 6, 2020
f5b9a1f
Merge branch 'feature/11.19_subscribe' into 11.19
huanhuana Jan 6, 2020
3eda683
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 6, 2020
a6a7139
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Jan 6, 2020
6b07f59
swan.showFavoriteGuide示例修改+示例小程序源码包链接更新
sunbai321 Jan 6, 2020
770b136
示例小程序源码包链接更新
sunbai321 Jan 6, 2020
2df2b85
Merge pull request #826 from sunbai01/master
wenlixiu Jan 6, 2020
b394d5a
Merge pull request #825 from Asadeer/patch-21
wenlixiu Jan 6, 2020
01a8a62
更新图片
Jan 6, 2020
19d070c
更新demo图
sunbai321 Jan 6, 2020
9c127fb
Merge pull request #819 from MaWenChao0417/patch-17
wenlixiu Jan 6, 2020
b9599d1
Merge pull request #827 from sunbai01/master
wenlixiu Jan 7, 2020
e1f1e2f
调整左侧位置
jingxiangzheng Jan 7, 2020
ad7de93
Merge pull request #828 from wannamakeudance/master
wenlixiu Jan 7, 2020
a24e8ff
Merge pull request #815 from MaWenChao0417/patch-16
wenlixiu Jan 7, 2020
eef4d43
Merge pull request #814 from MaWenChao0417/patch-15
wenlixiu Jan 7, 2020
1636438
Merge pull request #813 from MaWenChao0417/patch-14
wenlixiu Jan 7, 2020
abf24e2
Merge pull request #812 from MaWenChao0417/patch-12
wenlixiu Jan 7, 2020
b7bd272
Merge pull request #811 from MaWenChao0417/patch-13
wenlixiu Jan 7, 2020
662818f
搜索埋点改造
Jan 7, 2020
d7d1c20
Merge pull request #829 from wlfsmile/master
wenlixiu Jan 7, 2020
3d9e6ea
feat(subscribeService): 新增subscribeService
huanhuana Jan 7, 2020
1a244a8
feat(subscribeService): 新增subscribeService
huanhuana Jan 7, 2020
c57c6c2
API格式更新
Jan 7, 2020
c2f4b27
Merge pull request #830 from huanhuana/11.19
wenlixiu Jan 7, 2020
e578161
[冲突解决]
Jan 7, 2020
1271252
[冲突解决]
Jan 7, 2020
d5c1b1f
修改无名字&名字错误 代码片段链接
sunbai321 Jan 7, 2020
4285025
Merge remote-tracking branch 'upstream/master' into smt-lib
Jan 7, 2020
364d8b5
【小游戏】客户端版本映射1.0.x对应手百版本修改
zhangjing28 Jan 7, 2020
26c2b1c
Merge pull request #832 from zhangjing28/updateClientVersion
wenlixiu Jan 7, 2020
99ae6c1
文档瑕疵修改
sunbai321 Jan 7, 2020
ce543a6
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Jan 7, 2020
1773ea1
添加更新文档
MaWenChao0417 Jan 7, 2020
87a5bef
Update commentpublish.md
mumu-li Jan 7, 2020
c5c611c
更新API格式
Jan 7, 2020
205373f
Merge pull request #834 from mumu-li/patch-8
wenlixiu Jan 7, 2020
041029a
ai新增说明
Jan 7, 2020
4080e95
格式更新
Jan 8, 2020
fd51cf4
Merge pull request #831 from sunbai01/master
wenlixiu Jan 8, 2020
6c2f5e1
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 8, 2020
4c5d873
Merge pull request #833 from MaWenChao0417/20200107_BRANCH
wenlixiu Jan 8, 2020
1d6b583
fix:swan.onError示例去掉不存在的字段
rabbit77 Jan 8, 2020
3a7f1b1
更新工具changlog
Jan 8, 2020
2704fbf
API暂不上线
Jan 8, 2020
2ada1e2
更新
Jan 8, 2020
79bf96c
Merge pull request #835 from rabbit77/patch-37
wenlixiu Jan 8, 2020
64a9805
新增progress文档,修复animation-video文档问题
yutianmidori Jan 8, 2020
4eeff30
Merge branch 'master' into master
yutianmidori Jan 8, 2020
46b3a01
Merge pull request #836 from ceadalv/master
wenlixiu Jan 8, 2020
3c6f39d
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 8, 2020
875d68d
Update follow.md
mumu-li Jan 8, 2020
1c4fd9e
Update like.md
mumu-li Jan 8, 2020
9029374
Merge pull request #11 from swan-team/master
MarxJiao Jan 8, 2020
2ce79e4
Update diff.md
lok6666 Jan 8, 2020
cbbe245
Update uplog_tool_normal.md
bluestrings Jan 8, 2020
caa746d
Merge remote-tracking branch 'upstream/master' into smt-lib
Jan 8, 2020
1fb02e0
smt-lib文档开发完成
Jan 8, 2020
b62f40b
Merge remote-tracking branch 'upstream/master'
Jan 8, 2020
b25e0ad
Merge branch 'master' into smt-lib
Jan 8, 2020
0ffdd95
merge master
Jan 8, 2020
357099f
删除无用文档
Jan 8, 2020
a20c90d
Merge pull request #841 from hellna/smt-lib
wenlixiu Jan 9, 2020
e23fdce
Merge pull request #840 from bluestrings/patch-5
wenlixiu Jan 9, 2020
a2674b3
Merge pull request #839 from lok6666/patch-2
wenlixiu Jan 9, 2020
bad21f2
Merge pull request #838 from mumu-li/patch-10
wenlixiu Jan 9, 2020
eb3c142
Merge pull request #837 from mumu-li/patch-9
wenlixiu Jan 9, 2020
3759f67
Update media_ar-camera.md
wenlixiu Jan 9, 2020
6e5b511
Update diff.md
lok6666 Jan 9, 2020
e183422
Merge pull request #842 from lok6666/patch-3
wenlixiu Jan 9, 2020
d8d9059
Update page_start.md
wenlixiu Jan 9, 2020
c2848d0
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 9, 2020
a65c749
Update auditinginfo_settled.md
LYUyang-JK Jan 9, 2020
3b6db70
Update auditinginfo_settled.md
LYUyang-JK Jan 9, 2020
93b8fb2
新增lib组件
Jan 9, 2020
972f42d
Merge pull request #843 from LYUyang-JK/patch-24
wenlixiu Jan 9, 2020
d564494
Update ocr_swan-ai-ocrIdCard.md
wenlixiu Jan 9, 2020
82e1732
Merge branch 'master' into patch-25
LYUyang-JK Jan 9, 2020
2c3fbd4
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 9, 2020
5c609c6
Merge pull request #844 from LYUyang-JK/patch-25
wenlixiu Jan 9, 2020
a91b849
去除订阅服务内容
Jan 9, 2020
f6b7887
Update commentpublish.md
mumu-li Jan 9, 2020
eee6fd5
Update like.md
mumu-li Jan 9, 2020
b74abf7
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Jan 9, 2020
6af72a8
错别字修改
Jan 9, 2020
6f9c3de
更换text图示
sunbai321 Jan 9, 2020
ad54e48
修改swan.onPageNotFound代码示例
sunbai321 Jan 9, 2020
a0bfc22
更换链接名称为规范形式
sunbai321 Jan 9, 2020
659af1c
测试pr
sunbai321 Jan 9, 2020
90a389d
还原pr
sunbai321 Jan 9, 2020
0275c92
Update smt-promisify.md
xiongpinli Jan 10, 2020
c1198a8
Merge pull request #847 from sunbai01/master
wenlixiu Jan 10, 2020
404b06e
Merge pull request #845 from mumu-li/patch-12
wenlixiu Jan 10, 2020
8cb9e02
Merge pull request #846 from mumu-li/patch-11
wenlixiu Jan 10, 2020
de1234a
Merge pull request #848 from xiongpinli/patch-2
wenlixiu Jan 10, 2020
be87685
格式更新
Jan 10, 2020
8a731e4
格式回归
Jan 10, 2020
4216948
失效链接修改
Jan 10, 2020
7274652
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 10, 2020
11e3745
Update downloadTask.md
yushulinfeng Jan 10, 2020
45479a8
消息机制
jialebd Jan 10, 2020
ff77742
Update service.md
JovinHao Jan 13, 2020
1e9f457
Merge pull request #850 from jialebd/patch-19
wenlixiu Jan 13, 2020
7661e4f
Merge pull request #851 from JovinHao/patch-13
wenlixiu Jan 13, 2020
60321a7
Merge pull request #849 from yushulinfeng/patch-1
wenlixiu Jan 13, 2020
e53259f
Update pro.md
MaWenChao0417 Jan 13, 2020
d55cb04
Update base_rich-text.md
wenlixiu Jan 13, 2020
4200409
添加组件面板文档
MarxJiao Jan 13, 2020
6b561ab
修改二维码地址
rabbit77 Jan 13, 2020
88004dc
修改canIUse二维码
rabbit77 Jan 13, 2020
8a9c390
修改swan.createAnimationVideo二维码地址
rabbit77 Jan 13, 2020
7f78b30
修改animation-video 透明视频动画二维码
rabbit77 Jan 13, 2020
6da343c
更细API样式
Jan 13, 2020
1c13fd2
Merge pull request #853 from MarxJiao/master
wenlixiu Jan 13, 2020
29d2095
Merge pull request #857 from rabbit77/patch-41
wenlixiu Jan 13, 2020
0e545dd
Merge pull request #856 from rabbit77/patch-40
wenlixiu Jan 13, 2020
beba2c1
Merge pull request #855 from rabbit77/patch-39
wenlixiu Jan 13, 2020
6687123
Merge pull request #854 from rabbit77/patch-38
wenlixiu Jan 13, 2020
68b4b8e
Merge pull request #852 from MaWenChao0417/patch-19
wenlixiu Jan 13, 2020
8ebf739
更新changlog
Jan 13, 2020
8687317
发布器内容修改
Jan 13, 2020
ee6561b
格式修改
Jan 13, 2020
5e4ef77
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 13, 2020
b991024
修改服务端消息模版相关API路径
MaWenChao0417 Jan 13, 2020
4a071f2
Update function_api.md
wenlixiu Jan 13, 2020
8781e8b
Update app_service_page.md
wenlixiu Jan 13, 2020
76a05b1
更换官方示例图片
sunbai321 Jan 13, 2020
ee62591
Update swan-setPageInfo.md
wenlixiu Jan 13, 2020
46c414d
Update save_process.md
wenlixiu Jan 13, 2020
3ffa905
修改view示例
sunbai321 Jan 13, 2020
00c3689
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Jan 14, 2020
f5822d4
更新
Jan 14, 2020
a39085d
更新
Jan 14, 2020
45843d5
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 14, 2020
0e456a1
Merge pull request #858 from MaWenChao0417/20200113_BRANCH
wenlixiu Jan 14, 2020
e6f49c0
Update apilist.md
wenlixiu Jan 14, 2020
3e5a3b6
Update net_rule.md
wenlixiu Jan 14, 2020
58f92c1
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Jan 14, 2020
b2185ce
全屏发布器
sunbai321 Jan 14, 2020
d5695fa
Merge pull request #859 from sunbai01/master
wenlixiu Jan 14, 2020
6423187
Update apilist.md
wenlixiu Jan 14, 2020
cf6cc41
Update view_css.md
wenlixiu Jan 14, 2020
5dcfccd
Update function.md
wenlixiu Jan 14, 2020
9ced63d
文档规范修改
Jan 14, 2020
2a35268
文档规范修改
Jan 14, 2020
ba7c53a
全屏发布器代码链接替换
sunbai321 Jan 14, 2020
220977b
格式修改
Jan 14, 2020
34f27fd
格式更新
Jan 14, 2020
30c12b3
Update canvas_CanvasContext-fillText.md
naatgit Jan 14, 2020
cd49b86
Merge pull request #16 from swan-team/master
wannamakeudance Jan 15, 2020
27f70b6
change smt name
jingxiangzheng Jan 15, 2020
42cf86b
change smt name
jingxiangzheng Jan 15, 2020
ea686fa
Merge branch 'master' of https://github.com/wannamakeudance/swan-docs
jingxiangzheng Jan 15, 2020
f23d957
Merge pull request #862 from wannamakeudance/master
wenlixiu Jan 15, 2020
dfe052e
Merge pull request #861 from naatgit/patch-1
wenlixiu Jan 15, 2020
bb51807
Merge pull request #860 from wlfsmile/master
wenlixiu Jan 15, 2020
a61c0f4
Merge branch 'master' of https://github.com/swan-team/swan-docs
sunbai321 Jan 15, 2020
88f20c2
格式更新
Jan 15, 2020
1a8ada1
格式更新
Jan 15, 2020
e37da04
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 15, 2020
865979c
打点修复
Jan 15, 2020
796fea8
Merge pull request #863 from wlfsmile/master
wenlixiu Jan 15, 2020
a722688
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 15, 2020
d1dfaa6
Update pro.md
MaWenChao0417 Jan 15, 2020
b9d766f
Merge pull request #864 from MaWenChao0417/patch-21
wenlixiu Jan 15, 2020
ce11b4a
Update save_swan-saveFile.md
wenlixiu Jan 15, 2020
5ada378
Update map.md
wenlixiu Jan 15, 2020
4d76045
Update image_swan-chooseImage.md
wenlixiu Jan 15, 2020
e617431
Update websocket_SocketTask-onMessage.md
wenlixiu Jan 15, 2020
a2a4acc
更新
Jan 15, 2020
b04a710
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 15, 2020
df02539
Update commentpublish.md
mumu-li Jan 15, 2020
b483757
Update follow.md
mumu-li Jan 15, 2020
f03b1e2
Update like.md
mumu-li Jan 15, 2020
22e117e
Merge pull request #867 from mumu-li/patch-15
wenlixiu Jan 15, 2020
81034ab
Merge pull request #866 from mumu-li/patch-14
wenlixiu Jan 15, 2020
ab2dbdf
Merge pull request #865 from mumu-li/patch-13
wenlixiu Jan 15, 2020
96790c9
Update media_audio.md
MarxJiao Jan 15, 2020
4f8b84c
Update recorder_RecorderManager-start.md
wenlixiu Jan 15, 2020
c4cf690
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 15, 2020
edac3ec
Update canvas_swan-createCanvasContext.md
wenlixiu Jan 15, 2020
eddfde6
Update recorder_RecorderManager.md
wenlixiu Jan 15, 2020
151ddf0
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 15, 2020
d1cd37d
Update animation-video.md
wenlixiu Jan 15, 2020
a029791
更换swan.compressImage的gif
sunbai321 Jan 15, 2020
2308fd2
解决冲突
sunbai321 Jan 15, 2020
efb1c6d
新增扩展组件
Jan 15, 2020
72d2b9f
Merge pull request #868 from sunbai01/master
wenlixiu Jan 15, 2020
aa4e66b
低错修改
Jan 15, 2020
151364f
[冲突修改]
Jan 15, 2020
0966cba
更换swan.closeCommunityEditor二维码
sunbai321 Jan 15, 2020
cf078f4
Merge pull request #869 from sunbai01/master
wenlixiu Jan 15, 2020
90180ca
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 15, 2020
672fd5d
修改发布器文档
sunbai321 Jan 15, 2020
50adb63
同步文档
sunbai321 Jan 15, 2020
238ef7d
打点修复
Jan 16, 2020
7057d6a
Update rank_single.md
LYUyang-JK Jan 16, 2020
05cb8b5
Update auditinginfo_settled.md
LYUyang-JK Jan 16, 2020
ec2a77e
Update animationvideo_AnimationVideo.md
wenlixiu Jan 16, 2020
23e0073
文档指明lottie json文件地址
sunbai321 Jan 16, 2020
908b4d0
annimation-view示例文档内容修改
sunbai321 Jan 16, 2020
d203a01
Merge branch 'master' of https://github.com/sunbai01/swan-docs
sunbai321 Jan 16, 2020
148068d
Update diff.md
lok6666 Jan 16, 2020
9971a35
Merge pull request #875 from lok6666/patch-4
wenlixiu Jan 16, 2020
f2fe5f9
Update swan-getLocation.md
wenlixiu Jan 16, 2020
743259b
新增动态库
Jan 16, 2020
3f34efb
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 16, 2020
db3fdb1
Merge pull request #871 from LYUyang-JK/patch-26
wenlixiu Jan 16, 2020
0ef6c98
Merge pull request #872 from LYUyang-JK/patch-27
wenlixiu Jan 16, 2020
b219a7d
Merge pull request #873 from wlfsmile/master
wenlixiu Jan 16, 2020
83a90e9
Merge pull request #874 from sunbai01/master
wenlixiu Jan 16, 2020
e4f7fe1
Merge branch 'master' of https://github.com/swan-team/swan-docs
Jan 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update submitresource.md
  • Loading branch information
LYUyang-JK authored Jan 3, 2020
commit 3bcfe065ed49918aa03e78e5d79e7a87253df4dc
2 changes: 1 addition & 1 deletion source/_posts/develop/serverapi/submitresource.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sidebar: submitresource
|ext|string|否|扩展信息(JSON格式,参考附录三)|{"publish_time": "2018年11月1日"}|
|feed_sub_type|string|否|feed二级分类(参考附录二)|明星八卦(可选有限集合)|
|feed_type|string|是|feed一级分类(参考附录二)|娱乐(可选有限集合)|
|images|string|是|封面图片链接(JSON格式)(最多3张,单图片最大2M) 建议尺寸:宽>=375 & 高>=250;建议比例 宽:高=1.5:1|["https://b.bdstatic.com/miniapp/resource/image/demo1.png", "https://b.bdstatic.com/miniapp/resource/image/demo2.png"]|
|images|string|是|封面图片链接,要求必须是JSON格式,最多3张,单图片最大不能超2M,只支持JPG或PNG格式(jpeg不支持),尺寸要求:宽不能低于218px,且高不能低于146px。**重要提示:图片尺寸越大、清晰度越高、宽高比越接近3:2,越有助于降低不可用风险,促进分发。**|["https://b.bdstatic.com/miniapp/resource/image/demo1.png", "https://b.bdstatic.com/miniapp/resource/image/demo2.png"]|
|mapp_sub_type|string|是|资源子类型(参考附录一)|1001|
|mapp_type|string|是|资源类型(参考附录一)|1000|
|path|string|是|智能小程序落地页链接|/pages/detail/detail?id=100001|
Expand Down