提交 14c23357 编写于 作者: DCloud_JSON's avatar DCloud_JSON

解决冲突

上级 82616684
{ {
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/tabBar/component/component", "path": "pages/tabBar/component",
"style": { "style": {
"navigationBarTitleText": "内置组件", "navigationBarTitleText": "内置组件",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
} }
}, },
{ {
"path": "pages/tabBar/API/API", "path": "pages/tabBar/API",
"style": { "style": {
"navigationBarTitleText": "接口", "navigationBarTitleText": "接口",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
} }
}, },
{ {
"path": "pages/tabBar/CSS/CSS", "path": "pages/tabBar/CSS",
"style": { "style": {
"navigationBarTitleText": "CSS", "navigationBarTitleText": "CSS",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
...@@ -569,7 +569,7 @@ ...@@ -569,7 +569,7 @@
} }
}, { }, {
"path": "pages/tabBar/template/template", "path": "pages/tabBar/template",
"style": { "style": {
"navigationBarTitleText": "模板", "navigationBarTitleText": "模板",
"enablePullDownRefresh": false "enablePullDownRefresh": false
...@@ -597,25 +597,25 @@ ...@@ -597,25 +597,25 @@
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8",
"list": [{ "list": [{
"pagePath": "pages/tabBar/component/component", "pagePath": "pages/tabBar/component",
"iconPath": "static/component.png", "iconPath": "static/component.png",
"selectedIconPath": "static/componentHL.png", "selectedIconPath": "static/componentHL.png",
"text": "内置组件" "text": "内置组件"
}, },
{ {
"pagePath": "pages/tabBar/API/API", "pagePath": "pages/tabBar/API",
"iconPath": "static/api.png", "iconPath": "static/api.png",
"selectedIconPath": "static/apiHL.png", "selectedIconPath": "static/apiHL.png",
"text": "接口" "text": "接口"
}, },
{ {
"pagePath": "pages/tabBar/CSS/CSS", "pagePath": "pages/tabBar/CSS",
"iconPath": "static/extui.png", "iconPath": "static/extui.png",
"selectedIconPath": "static/extuiHL.png", "selectedIconPath": "static/extuiHL.png",
"text": "CSS" "text": "CSS"
}, },
{ {
"pagePath": "pages/tabBar/template/template", "pagePath": "pages/tabBar/template",
"iconPath": "static/template.png", "iconPath": "static/template.png",
"selectedIconPath": "static/templateHL.png", "selectedIconPath": "static/templateHL.png",
"text": "模板" "text": "模板"
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</script> </script>
<style> <style>
@import '../../../common/uni-uvue.css'; @import '../../common/uni-uvue.css';
.uni-container { .uni-container {
flex: 1; flex: 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册