diff --git a/app/app.json b/app/app.json index e354b0f..2695222 100644 --- a/app/app.json +++ b/app/app.json @@ -1,17 +1,17 @@ { "pages": [ + "pages/order/show", "pages/order/list", + "pages/index/index", "pages/address/list", "pages/address/add", "pages/address/select", - "pages/index/index", "pages/order/quasi", "pages/shop/show", "pages/mine/mine", "pages/index/address", "pages/shop/category", - "pages/shop/search", - "pages/order/show" + "pages/shop/search" ], "window": { "backgroundColor": "#f8f8f8", @@ -25,20 +25,20 @@ "list": [ { "pagePath": "pages/index/index", - "iconPath": "images/Shop_Tabbar_TakeOut_Empty@2x.png", - "selectedIconPath": "images/Shop_Tabbar_TakeOut_Full@2x.png", + "iconPath": "images/tabbar/Shop_Tabbar_TakeOut_Empty@2x.png", + "selectedIconPath": "images/tabbar/Shop_Tabbar_TakeOut_Full@2x.png", "text": "首页" }, { "pagePath": "pages/order/list", - "iconPath": "images/Shop_Tabbar_Order_Empty@2x.png", - "selectedIconPath": "images/Shop_Tabbar_Order_Full@2x.png", + "iconPath": "images/tabbar/Shop_Tabbar_Order_Empty@2x.png", + "selectedIconPath": "images/tabbar/Shop_Tabbar_Order_Full@2x.png", "text": "订单" }, { "pagePath": "pages/mine/mine", - "iconPath": "images/Shop_Tabbar_My_Empty@2x.png", - "selectedIconPath": "images/Shop_Tabbar_My_Full@2x.png", + "iconPath": "images/tabbar/Shop_Tabbar_My_Empty@2x.png", + "selectedIconPath": "images/tabbar/Shop_Tabbar_My_Full@2x.png", "text": "我的" } ] diff --git a/app/images/status/order_status_money_icon_current@2x.png b/app/images/status/order_status_money_icon_current@2x.png new file mode 100644 index 0000000..ed9c1ee Binary files /dev/null and b/app/images/status/order_status_money_icon_current@2x.png differ diff --git a/app/images/status/order_status_rider_icon_current@2x.png b/app/images/status/order_status_rider_icon_current@2x.png new file mode 100644 index 0000000..391abdb Binary files /dev/null and b/app/images/status/order_status_rider_icon_current@2x.png differ diff --git a/app/images/status/order_status_service_icon_current@2x.png b/app/images/status/order_status_service_icon_current@2x.png new file mode 100644 index 0000000..9b5dbbf Binary files /dev/null and b/app/images/status/order_status_service_icon_current@2x.png differ diff --git a/app/images/status/order_status_service_icon_fail_current@2x.png b/app/images/status/order_status_service_icon_fail_current@2x.png new file mode 100644 index 0000000..0db9362 Binary files /dev/null and b/app/images/status/order_status_service_icon_fail_current@2x.png differ diff --git a/app/images/status/order_status_shop_icon_current@2x.png b/app/images/status/order_status_shop_icon_current@2x.png new file mode 100644 index 0000000..4225cc3 Binary files /dev/null and b/app/images/status/order_status_shop_icon_current@2x.png differ diff --git a/app/images/status/order_status_user_icon_current@2x.png b/app/images/status/order_status_user_icon_current@2x.png new file mode 100644 index 0000000..edec5e2 Binary files /dev/null and b/app/images/status/order_status_user_icon_current@2x.png differ diff --git a/app/images/Shop_Tabbar_My_Empty@2x.png b/app/images/tabbar/Shop_Tabbar_My_Empty@2x.png similarity index 100% rename from app/images/Shop_Tabbar_My_Empty@2x.png rename to app/images/tabbar/Shop_Tabbar_My_Empty@2x.png diff --git a/app/images/Shop_Tabbar_My_Full@2x.png b/app/images/tabbar/Shop_Tabbar_My_Full@2x.png similarity index 100% rename from app/images/Shop_Tabbar_My_Full@2x.png rename to app/images/tabbar/Shop_Tabbar_My_Full@2x.png diff --git a/app/images/Shop_Tabbar_Order_Empty@2x.png b/app/images/tabbar/Shop_Tabbar_Order_Empty@2x.png similarity index 100% rename from app/images/Shop_Tabbar_Order_Empty@2x.png rename to app/images/tabbar/Shop_Tabbar_Order_Empty@2x.png diff --git a/app/images/Shop_Tabbar_Order_Full@2x.png b/app/images/tabbar/Shop_Tabbar_Order_Full@2x.png similarity index 100% rename from app/images/Shop_Tabbar_Order_Full@2x.png rename to app/images/tabbar/Shop_Tabbar_Order_Full@2x.png diff --git a/app/images/Shop_Tabbar_TakeOut_Empty@2x.png b/app/images/tabbar/Shop_Tabbar_TakeOut_Empty@2x.png similarity index 100% rename from app/images/Shop_Tabbar_TakeOut_Empty@2x.png rename to app/images/tabbar/Shop_Tabbar_TakeOut_Empty@2x.png diff --git a/app/images/Shop_Tabbar_TakeOut_Full@2x.png b/app/images/tabbar/Shop_Tabbar_TakeOut_Full@2x.png similarity index 100% rename from app/images/Shop_Tabbar_TakeOut_Full@2x.png rename to app/images/tabbar/Shop_Tabbar_TakeOut_Full@2x.png diff --git a/app/pages/order/show.js b/app/pages/order/show.js index b006552..4fca748 100644 --- a/app/pages/order/show.js +++ b/app/pages/order/show.js @@ -1,19 +1,99 @@ // pages/order/show.js Page({ - data:{}, - onLoad:function(options){ + data: { + info: { + "order_id": "1370", + "order_no": "2017042815510158201158862546", + "day_sn": "1", + "seller_id": "2", + "user_id": "4", + "state": "5", + "add_time": "1493365861", + "order_price": "42.98", + "pay_price": "34.98", + "goods_price": "22.98", + "cut_money": "8.00", + "coupon_money": "0.00", + "packing_fee": "2.00", + "delivery_fee": "18.00", + "receiver": "test4", + "receiver_addr": "龙华大厦", + "receiver_gps": "120.69101,28.002974", + "receiver_phone": "13000000005", + "receive_time": "1493369461", + "distance": "7.177", + "remark": null, + "is_reviews": "0", + "is_delete": "0", + "delivery_order_id": "0", + "title": "鸡腿饭(大)", + "receiver_city": "330300", + "take_time": null, + "remind_time": "0", + "pay_type": null, + "sys_settle_no": null, + "settle_no": null, + "commision": "0.00", + "user_coupon_id": null, + "real_delivery_fee": "18.00", + "cut_delivery_fee": "0.00", + "service_money": "0.00", + "seller_name": "鲜极道", + "seller_phone": "88888888", + "delivery_phone": "13906641410", + "goods": [ + { + "goods_id": "29", + "sub_id": "50", + "seller_id": "2", + "detail": "鸡腿饭 xx", + "sales": "46", + "praise": "0", + "state": "1", + "commision": "3.00", + "goods_name": "鸡腿饭(大)", + "price": "22.98", + "packing_fee": "2.00", + "stock": "74", + "is_delete": "0", + "pic_url": "http://test.storesystem.cn/Uploadfile/Img/seller_goods/1461034075146103407535640.jpg", + "num": "1", + "price_sum": "22.98" + } + ], + "expire_time": 0, + "left_time": 0, + "flow": [ + { + "time": "1493365861", + "state": "1", + "status": "订单提交成功，待支付", + "remark": "" + }, + { + "time": "1493366164", + "state": "5", + "status": "订单已取消", + "remark": "" + } + ], + "localphone": "13906641410" + } + + }, + onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 }, - onReady:function(){ + onReady: function () { // 页面渲染完成 }, - onShow:function(){ + onShow: function () { // 页面显示 }, - onHide:function(){ + onHide: function () { // 页面隐藏 }, - onUnload:function(){ + onUnload: function () { // 页面关闭 } }) \ No newline at end of file diff --git a/app/pages/order/show.wxml b/app/pages/order/show.wxml index 5a1f259..c629335 100644 --- a/app/pages/order/show.wxml +++ b/app/pages/order/show.wxml @@ -1,4 +1,20 @@ + - - test - + + + + 订单状态 + + + 订单详情 + + + + + + + + 详情 + + + \ No newline at end of file diff --git a/app/pages/order/show.wxss b/app/pages/order/show.wxss index e34ca80..f74402d 100644 --- a/app/pages/order/show.wxss +++ b/app/pages/order/show.wxss @@ -1 +1,35 @@ -/* pages/order/show.wxss */ \ No newline at end of file +/* pages/order/show.wxss */ + +.tab { + display: flex; + flex-direction: column; + height: 100vh; + background-color: #fff; +} + +.tab__navbar { + display: flex; + color: #999; + border-bottom: 1rpx solid #e8e8e8; +} + +.tab__navbar-item { + position: relative; + padding: 5px 8px; +} +.tab__navbar-item_active { + color: #000; +} +.tab__navbar-item_active::after { + content: ''; + position: absolute; + left: 0; + bottom: -1rpx; + height: 2rpx; + width: 100%; + background-color: #ff5801; +} + +.tab-swiper { + flex: 1; +}