diff --git a/App.vue b/App.vue index 574abaa..493643a 100644 --- a/App.vue +++ b/App.vue @@ -13,8 +13,8 @@ .app { background-color: #F4F5F7; width: 100%; - // height: 100vh; - position: relative; + height: 100vh; + // position: relative; color: #000000; padding: 30rpx 0 200rpx 0; diff --git a/pages.json b/pages.json index fb1e719..dba0239 100644 --- a/pages.json +++ b/pages.json @@ -4,15 +4,113 @@ }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { + "path": "pages/order/order", + "style": { + "navigationBarTitleText": "我的订单", + "enablePullDownRefresh": false + } + + },{ + "path": "pages/CommodityOrder/CommodityOrder", + "style": { + "navigationBarTitleText": "商品订单", + "enablePullDownRefresh": false + } + + }, + { + "path" : "pages/orderDetails/orderDetails", + "style" : + { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + + },{ + "path": "pages/refundType/refundType", + "style": { + "navigationBarTitleText": "选择退款类型", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + + }, { + "path": "pages/After sales details/After sales details", + "style": { + "navigationBarTitleText": "售后详情", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/Nursingstationserviceorder/Nursingstationserviceorder", + "style": { + "navigationBarTitleText": "护理站服务订单", + "enablePullDownRefresh": false + } + + }, + { + "path": "pages/tobePaid/tobePaid", + "style": { + "navigationBarTitleText": "待付款", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/Completed/Completed", + "style": { + "navigationBarTitleText": "已完成", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/received/received", + "style": { + "navigationBarTitleText": "待收货", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/Applforrefund/Applforrefund", + "style": { + "navigationBarTitleText": "申请退款", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/modify/modify", + "style": { + "navigationBarTitleText": "修改信息", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/Personal Center/Personal Center", + "style": { + "navigationBarTitleText": "个人中心", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/personal information/personal information", + "style": { + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4C7BC9", + "navigationBarTextStyle": "white" + } + + }, { "path": "pages/confirmOrder/confirmOrder", "style": { "navigationBarTitleText": "确认订单", "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4C7BC9" ,//背景颜色 + "navigationBarBackgroundColor": "#4C7BC9", //背景颜色 "navigationBarTextStyle": "white" - + } - },{ + }, { "path": "pages/shopping/shopping", //商城 "style": { "navigationBarTitleText": "医路优品", @@ -25,7 +123,7 @@ "style": { "navigationBarTitleText": "个人信息", "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4C7BC9" ,//背景颜色 + "navigationBarBackgroundColor": "#4C7BC9", //背景颜色 "navigationBarTextStyle": "white" } @@ -44,7 +142,7 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - },{ + }, { "path": "pages/information/information", "style": { "navigationBarTitleText": "完善个人信息", @@ -134,14 +232,6 @@ "onReachBottomDistance": 20, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } - }, { - "path": "pages/appointment/appointment", - "style": { - "navigationBarTitleText": "选择时间", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { "path": "pages/detail/detail", "style": { @@ -156,7 +246,7 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - },{ + }, { "path": "pages/modifyAddress/modifyAddress", "style": { "navigationBarTitleText": "修改地址", @@ -173,6 +263,16 @@ "navigationBarBackgroundColor": "#ffffff" } } + + , { + "path": "pages/Service Details/Service Details", + "style": { + "navigationBarTitleText": "服务详情", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", @@ -200,5 +300,25 @@ "text": "个人中心" } ] + }, + "tabBar": { + "color": "#7A7E83", + "selectedColor": "#435950", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/Personal Center/Personal Center", + "iconPath": "static/homepagew.png", + "selectedIconPath": "static/homepagews.png", + "text": "首页" + + }, + { + "pagePath": "", + "iconPath": "static/userw.png", + "selectedIconPath": "static/users.png", + "text": "我的" + } + ] } } diff --git a/pages/After sales details/After sales details.vue b/pages/After sales details/After sales details.vue new file mode 100644 index 0000000..c300f8a --- /dev/null +++ b/pages/After sales details/After sales details.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue new file mode 100644 index 0000000..67803cb --- /dev/null +++ b/pages/Applforrefund/Applforrefund.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue new file mode 100644 index 0000000..525fe7b --- /dev/null +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/pages/Completed/Completed.vue b/pages/Completed/Completed.vue new file mode 100644 index 0000000..0c31677 --- /dev/null +++ b/pages/Completed/Completed.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue new file mode 100644 index 0000000..d14689e --- /dev/null +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/pages/Service Details/Service Details.vue b/pages/Service Details/Service Details.vue new file mode 100644 index 0000000..fef5651 --- /dev/null +++ b/pages/Service Details/Service Details.vue @@ -0,0 +1,290 @@ + + + + + diff --git a/pages/order/order.vue b/pages/order/order.vue new file mode 100644 index 0000000..769d524 --- /dev/null +++ b/pages/order/order.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/pages/received/received.vue b/pages/received/received.vue new file mode 100644 index 0000000..fc06911 --- /dev/null +++ b/pages/received/received.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/static/Tobepaid.png b/static/Tobepaid.png new file mode 100644 index 0000000..49c967e Binary files /dev/null and b/static/Tobepaid.png differ diff --git a/static/evaluated.png b/static/evaluated.png new file mode 100644 index 0000000..8cd65fa Binary files /dev/null and b/static/evaluated.png differ diff --git a/static/finished.png b/static/finished.png new file mode 100644 index 0000000..0b35f09 Binary files /dev/null and b/static/finished.png differ diff --git a/static/head portrait.png b/static/head portrait.png new file mode 100644 index 0000000..ee21ec4 Binary files /dev/null and b/static/head portrait.png differ diff --git a/static/home1.png b/static/home1.png new file mode 100644 index 0000000..5525a3f Binary files /dev/null and b/static/home1.png differ diff --git a/static/order.png b/static/order.png new file mode 100644 index 0000000..98ecbc2 Binary files /dev/null and b/static/order.png differ diff --git a/static/person.png b/static/person.png new file mode 100644 index 0000000..0d3600c Binary files /dev/null and b/static/person.png differ diff --git a/static/pic.png b/static/pic.png new file mode 100644 index 0000000..bf2e92e Binary files /dev/null and b/static/pic.png differ diff --git a/static/pingfen.png b/static/pingfen.png new file mode 100644 index 0000000..31b0e56 Binary files /dev/null and b/static/pingfen.png differ diff --git a/static/received.png b/static/received.png new file mode 100644 index 0000000..fd196a9 Binary files /dev/null and b/static/received.png differ diff --git a/static/shangpindingdan.png b/static/shangpindingdan.png new file mode 100644 index 0000000..6ed75e8 Binary files /dev/null and b/static/shangpindingdan.png differ diff --git a/static/spjtcs.png b/static/spjtcs.png new file mode 100644 index 0000000..59280b7 Binary files /dev/null and b/static/spjtcs.png differ diff --git a/static/yilaiofuwu.jpg b/static/yilaiofuwu.jpg new file mode 100644 index 0000000..fe3d2a8 Binary files /dev/null and b/static/yilaiofuwu.jpg differ