diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index 7693e5e..51a5d5d 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -43,6 +43,13 @@ "title": "分类", key: 'category', }, + { + "selectedIconPath": "/static/image/tabbar/user-center-active.png", + "iconPath": "/static/image/tabbar/user-center.png", + "pagePath": "/pages/index/center", + "title": "我的", + key: 'center', + }, ] }; }, diff --git a/pages.json b/pages.json index 070c7b5..6a4fddc 100644 --- a/pages.json +++ b/pages.json @@ -11,6 +11,15 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "pages/index/center", + "style": { + "navigationBarTitleText": "", + "componentPlaceholder": { + "order-card": "view" + } + } } ], "preloadRule": { diff --git a/pages/index/center.vue b/pages/index/center.vue new file mode 100644 index 0000000..f655b52 --- /dev/null +++ b/pages/index/center.vue @@ -0,0 +1,315 @@ + + + + + \ No newline at end of file diff --git a/pages_order/auth/agreementConfirmPopup.vue b/pages_order/auth/agreementConfirmPopup.vue new file mode 100644 index 0000000..7063a47 --- /dev/null +++ b/pages_order/auth/agreementConfirmPopup.vue @@ -0,0 +1,115 @@ + + + + + \ No newline at end of file diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index 292f9d1..92dda87 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -1,155 +1,157 @@ diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index 50c988f..b10db03 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -1,133 +1,361 @@ \ No newline at end of file diff --git a/pages_order/center/orderCard.vue b/pages_order/center/orderCard.vue new file mode 100644 index 0000000..5c5e58d --- /dev/null +++ b/pages_order/center/orderCard.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/pages_order/center/popupQrCode.vue b/pages_order/center/popupQrCode.vue new file mode 100644 index 0000000..dd23646 --- /dev/null +++ b/pages_order/center/popupQrCode.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/pages_order/center/styles/card.scss b/pages_order/center/styles/card.scss new file mode 100644 index 0000000..90dd6a5 --- /dev/null +++ b/pages_order/center/styles/card.scss @@ -0,0 +1,15 @@ + + .card { + margin-top: 32rpx; + width: 100%; + background: #FAFAFF; + border: 2rpx solid #FFFFFF; + border-radius: 32rpx; + box-sizing: border-box; + } + + .cols { + .col { + flex: 1; + } + } \ No newline at end of file diff --git a/pages_order/components/agreementModal.vue b/pages_order/components/agreementModal.vue new file mode 100644 index 0000000..82c5541 --- /dev/null +++ b/pages_order/components/agreementModal.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/pages_order/components/formInput.vue b/pages_order/components/formInput.vue new file mode 100644 index 0000000..cde1cda --- /dev/null +++ b/pages_order/components/formInput.vue @@ -0,0 +1,46 @@ + + + + diff --git a/pages_order/static/auth/avatar.png b/pages_order/static/auth/avatar.png new file mode 100644 index 0000000..349d7d0 Binary files /dev/null and b/pages_order/static/auth/avatar.png differ diff --git a/pages_order/static/center/avatar-default.png b/pages_order/static/center/avatar-default.png new file mode 100644 index 0000000..9852096 Binary files /dev/null and b/pages_order/static/center/avatar-default.png differ diff --git a/pages_order/static/center/icon-aboutUs.png b/pages_order/static/center/icon-aboutUs.png new file mode 100644 index 0000000..1d0f5cd Binary files /dev/null and b/pages_order/static/center/icon-aboutUs.png differ diff --git a/pages_order/static/center/icon-change.png b/pages_order/static/center/icon-change.png new file mode 100644 index 0000000..dc1ea80 Binary files /dev/null and b/pages_order/static/center/icon-change.png differ diff --git a/pages_order/static/center/icon-comment.png b/pages_order/static/center/icon-comment.png new file mode 100644 index 0000000..004d06a Binary files /dev/null and b/pages_order/static/center/icon-comment.png differ diff --git a/pages_order/static/center/icon-detectBook.png b/pages_order/static/center/icon-detectBook.png new file mode 100644 index 0000000..607da4d Binary files /dev/null and b/pages_order/static/center/icon-detectBook.png differ diff --git a/pages_order/static/center/icon-instruc.png b/pages_order/static/center/icon-instruc.png new file mode 100644 index 0000000..bb4c764 Binary files /dev/null and b/pages_order/static/center/icon-instruc.png differ diff --git a/pages_order/static/center/icon-logout.png b/pages_order/static/center/icon-logout.png new file mode 100644 index 0000000..9cb3fbb Binary files /dev/null and b/pages_order/static/center/icon-logout.png differ diff --git a/pages_order/static/center/icon-modifyInfo.png b/pages_order/static/center/icon-modifyInfo.png new file mode 100644 index 0000000..4e097ab Binary files /dev/null and b/pages_order/static/center/icon-modifyInfo.png differ diff --git a/pages_order/static/center/icon-service.png b/pages_order/static/center/icon-service.png new file mode 100644 index 0000000..1a8129e Binary files /dev/null and b/pages_order/static/center/icon-service.png differ diff --git a/pages_order/static/center/icon-userAgreement.png b/pages_order/static/center/icon-userAgreement.png new file mode 100644 index 0000000..23078fc Binary files /dev/null and b/pages_order/static/center/icon-userAgreement.png differ diff --git a/pages_order/static/center/order-1.png b/pages_order/static/center/order-1.png new file mode 100644 index 0000000..848fdbf Binary files /dev/null and b/pages_order/static/center/order-1.png differ diff --git a/pages_order/static/center/order-2.png b/pages_order/static/center/order-2.png new file mode 100644 index 0000000..7ce0a80 Binary files /dev/null and b/pages_order/static/center/order-2.png differ diff --git a/pages_order/static/center/order-3.png b/pages_order/static/center/order-3.png new file mode 100644 index 0000000..6321e14 Binary files /dev/null and b/pages_order/static/center/order-3.png differ diff --git a/pages_order/static/center/order-4.png b/pages_order/static/center/order-4.png new file mode 100644 index 0000000..04863a1 Binary files /dev/null and b/pages_order/static/center/order-4.png differ diff --git a/pages_order/static/center/order-5.png b/pages_order/static/center/order-5.png new file mode 100644 index 0000000..68ef86a Binary files /dev/null and b/pages_order/static/center/order-5.png differ diff --git a/static/image/center-bg.png b/static/image/center-bg.png new file mode 100644 index 0000000..afdddad Binary files /dev/null and b/static/image/center-bg.png differ diff --git a/static/image/temp-29.png b/static/image/temp-29.png new file mode 100644 index 0000000..0fc53d4 Binary files /dev/null and b/static/image/temp-29.png differ