Merge branch 'zb-drawer' of https://github.com/zouzhibin/zb-table
Conflicts: pages/table/all.js pages/table/index.vue unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map unpackage/dist/dev/mp-alipay/common/runtime.js unpackage/dist/dev/mp-alipay/common/vendor.js unpackage/dist/dev/mp-alipay/pages/index/index.js unpackage/dist/dev/mp-alipay/uni_modules/zb-table/components/zb-table/zb-table.json unpackage/dist/dev/mp-weixin/common/runtime.js unpackage/dist/dev/mp-weixin/common/vendor.js unpackage/dist/dev/mp-weixin/uni_modules/zb-table/components/zb-table/zb-table.json
This commit is contained in:
22
unpackage/dist/dev/mp-alipay/app.json
vendored
22
unpackage/dist/dev/mp-alipay/app.json
vendored
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"pages": [
|
||||
"pages/index/index",
|
||||
"pages/table/index"
|
||||
"pages/index/index"
|
||||
],
|
||||
"subPackages": [],
|
||||
"window": {
|
||||
@@ -9,24 +8,5 @@
|
||||
"titleBarColor": "#F8F8F8",
|
||||
"backgroundColor": "#F8F8F8"
|
||||
},
|
||||
"tabBar": {
|
||||
"textColor": "#7A7E83",
|
||||
"selectedColor": "#007AFF",
|
||||
"backgroundColor": "#F8F8F8",
|
||||
"items": [
|
||||
{
|
||||
"pagePath": "pages/index/index",
|
||||
"name": "主页",
|
||||
"icon": "static/home.png",
|
||||
"activeIcon": "static/home-active.png"
|
||||
},
|
||||
{
|
||||
"pagePath": "pages/table/index",
|
||||
"name": "表格组件",
|
||||
"icon": "static/component.png",
|
||||
"activeIcon": "static/componentHL.png"
|
||||
}
|
||||
]
|
||||
},
|
||||
"usingComponents": {}
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
{
|
||||
"defaultTitle": "uni-app",
|
||||
"usingComponents": {
|
||||
"zb-drawer": "/uni_modules/zb-drawer/components/zb-drawer/zb-drawer"
|
||||
}
|
||||
"usingComponents": {}
|
||||
}
|
||||
Reference in New Issue
Block a user