diff --git a/src/pages.json b/src/pages.json index 8ed4b41..a118cdf 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,6 +1,16 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - + { + "path": "pages/menu/forth", + "style": { + "navigationBarTitleText": "个人中心", + "componentPlaceholder": { + "mine-header": "view", + "bottom-logo": "view", + "line-tab": "view" + } + } + }, { "path": "pages/index/index", "style": { @@ -924,6 +934,17 @@ } } ] + }, + { + "root": "subpackage/menu", + "pages": [ + { + "path": "pages/index", + "style" : { + "navigationBarTitleText": "" + } + } + ] } ], "globalStyle": { diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue new file mode 100644 index 0000000..aefd4df --- /dev/null +++ b/src/pages/menu/forth.vue @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file diff --git a/src/static/images/icon/arrow_b2.png b/src/static/images/icon/arrow_b2.png index 54df2b3..e4e1580 100644 Binary files a/src/static/images/icon/arrow_b2.png and b/src/static/images/icon/arrow_b2.png differ diff --git a/src/subpackage/menu/components/bottom_logo.vue b/src/subpackage/menu/components/bottom_logo.vue new file mode 100644 index 0000000..9806574 --- /dev/null +++ b/src/subpackage/menu/components/bottom_logo.vue @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/menu/components/mine/header.vue b/src/subpackage/menu/components/mine/header.vue new file mode 100644 index 0000000..3ee60ac --- /dev/null +++ b/src/subpackage/menu/components/mine/header.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/menu/components/mine/line_tab.vue b/src/subpackage/menu/components/mine/line_tab.vue new file mode 100644 index 0000000..4a0d219 --- /dev/null +++ b/src/subpackage/menu/components/mine/line_tab.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/menu/pages/index.vue b/src/subpackage/menu/pages/index.vue new file mode 100644 index 0000000..914b254 --- /dev/null +++ b/src/subpackage/menu/pages/index.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/menu/static/images/arrow_b2.png b/src/subpackage/menu/static/images/arrow_b2.png new file mode 100644 index 0000000..e4e1580 Binary files /dev/null and b/src/subpackage/menu/static/images/arrow_b2.png differ diff --git a/src/subpackage/menu/static/images/bot_logo.png b/src/subpackage/menu/static/images/bot_logo.png new file mode 100644 index 0000000..5ef008a Binary files /dev/null and b/src/subpackage/menu/static/images/bot_logo.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/0.png b/src/subpackage/menu/static/images/mine_tab/0.png new file mode 100644 index 0000000..0a80539 Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/0.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/1.png b/src/subpackage/menu/static/images/mine_tab/1.png new file mode 100644 index 0000000..3efd220 Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/1.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/2.png b/src/subpackage/menu/static/images/mine_tab/2.png new file mode 100644 index 0000000..8c1b55c Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/2.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/3.png b/src/subpackage/menu/static/images/mine_tab/3.png new file mode 100644 index 0000000..b203514 Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/3.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/4.png b/src/subpackage/menu/static/images/mine_tab/4.png new file mode 100644 index 0000000..9722c80 Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/4.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/5.png b/src/subpackage/menu/static/images/mine_tab/5.png new file mode 100644 index 0000000..5ada9fe Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/5.png differ diff --git a/src/subpackage/menu/static/images/mine_tab/6.png b/src/subpackage/menu/static/images/mine_tab/6.png new file mode 100644 index 0000000..496eed0 Binary files /dev/null and b/src/subpackage/menu/static/images/mine_tab/6.png differ diff --git a/src/subpackage/message/components/edit/fixed_button.vue b/src/subpackage/message/components/edit/fixed_button.vue index 612981c..5ddd100 100644 --- a/src/subpackage/message/components/edit/fixed_button.vue +++ b/src/subpackage/message/components/edit/fixed_button.vue @@ -18,6 +18,7 @@ export default { bottom: 0; padding: 10upx 20upx; width: 100%; + @include isPd(10upx); @include ctf(center); .fb-btn{ margin: 0 20upx; diff --git a/src/subpackage/message/components/edit/info_edit.vue b/src/subpackage/message/components/edit/info_edit.vue new file mode 100644 index 0000000..80e49ee --- /dev/null +++ b/src/subpackage/message/components/edit/info_edit.vue @@ -0,0 +1,135 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue index ebdfd04..162457c 100644 --- a/src/subpackage/message/components/edit/upload_img.vue +++ b/src/subpackage/message/components/edit/upload_img.vue @@ -4,7 +4,7 @@ - + @@ -38,7 +38,7 @@ export default { font-size: 0; .ul-item{ position: relative; - margin: 0 12upx; + margin: 0 10upx; vertical-align: top; display: inline-block; width: 200upx; @@ -58,7 +58,6 @@ export default { right: 6upx; width: 40upx; height: 40upx; - background: darkblue; } } .ul-add{ diff --git a/src/subpackage/message/pages/complaint/edit.vue b/src/subpackage/message/pages/complaint/edit.vue index e840ec0..cfce4fe 100644 --- a/src/subpackage/message/pages/complaint/edit.vue +++ b/src/subpackage/message/pages/complaint/edit.vue @@ -1,15 +1,19 @@