diff --git a/src/pages.json b/src/pages.json index a80879c96e40a7cf3c5729b274664d2949d27950..ce5163165203ec702dfaf0facba167c3a2102040 100644 --- a/src/pages.json +++ b/src/pages.json @@ -184,12 +184,6 @@ "iconPath": "/static/images/tabbar/home.png", "selectedIconPath": "/static/images/tabbar/home_active.png" }, - { - "pagePath": "pages/sale/sale", - "text": "卖书", - "iconPath": "/static/images/tabbar/sale.png", - "selectedIconPath": "/static/images/tabbar/sale_active.png" - }, { "pagePath": "pages/cart/cart", "text": "购物车", @@ -223,10 +217,6 @@ "path":"pages/book_details/book_details", "query":"book_index=0" }, - { - "name":"我要卖书", - "path":"pages/sale/sale" - }, { "name":"提交页面", "path":"pages/submit/submit" diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ce4970ed0f7723c508806c452e0c12b63f26bff3..286a7db588fe557d7554f8ae29b67f66760dbb06 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -184,12 +184,12 @@ selectedIconPath: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-6cc14c2d-a80d-4585-aadc-aa0ff4090c36/4294a4d8-4ce4-47b1-8a71-198193683e4d.jpg', text: "首页" }, - { - page: "sale", - iconPath: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-6cc14c2d-a80d-4585-aadc-aa0ff4090c36/bc2c6b5a-8c77-4170-a0a1-21741fe4c314.png', - selectedIconPath: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-6cc14c2d-a80d-4585-aadc-aa0ff4090c36/778e2a89-56bc-4c4e-813d-2a8d5e430178.png', - text: "卖书" - }, + // { + // page: "sale", + // iconPath: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-6cc14c2d-a80d-4585-aadc-aa0ff4090c36/bc2c6b5a-8c77-4170-a0a1-21741fe4c314.png', + // selectedIconPath: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-6cc14c2d-a80d-4585-aadc-aa0ff4090c36/778e2a89-56bc-4c4e-813d-2a8d5e430178.png', + // text: "卖书" + // }, { page: "cart", iconPath: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-6cc14c2d-a80d-4585-aadc-aa0ff4090c36/e3916a69-e608-4954-ac6c-b642fba13bda.jpg', diff --git a/src/pages/myOrders/myOrders.vue b/src/pages/myOrders/myOrders.vue index 6320bc130540d59e925994a48ca8ee97e24f008d..b266ac672d2acc17d945024edbfef8942881a05f 100644 --- a/src/pages/myOrders/myOrders.vue +++ b/src/pages/myOrders/myOrders.vue @@ -505,18 +505,21 @@ orderTabs:[], buyOrderTabs:[ '全部订单', - '待付款', - '待发货', - '待收货', - '退款/售后' - ], - saleOrderTabs:[ - '全部订单', - '待初审', - '待取件', - '待审核', - '待到款' + '已完成', + '未完成', + '退款' + // '待付款', + // '待发货', + // '待收货', + // '退款/售后' ], + // saleOrderTabs:[ + // '全部订单', + // '待初审', + // '待取件', + // '待审核', + // '待到款' + // ], CustomBar:this.CustomBar, // orderList:[ // { @@ -556,16 +559,19 @@ // } // ] orderStatus:[ - '待付款', - '待发货', - '待收货', - '退款/售后', - '待初审', - '待取件', - '待审核', - '待收款', '已完成', - '取消订单' + '未完成', + '退款' + // '待付款', + // '待发货', + // '待收货', + // '退款/售后', + // '待初审', + // '待取件', + // '待审核', + // '待收款', + // '已完成', + // '取消订单' ], bookCondition:{ good:['良好',0.32], diff --git a/src/pages/sale/sale.vue b/src/pages/sale/sale.vue index 437d81bf4cf9eaeff2c346a92b07fae9fed648fa..fec66948fafc340a797d10a41c2a8eb0bd6b70a3 100644 --- a/src/pages/sale/sale.vue +++ b/src/pages/sale/sale.vue @@ -557,4 +557,4 @@ } - + \ No newline at end of file diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue index 2972133f71ce77ba3160cd6c16a7d9507f3de371..ada7d74327010466d6ecd3908f535482624220fb 100644 --- a/src/pages/user/user.vue +++ b/src/pages/user/user.vue @@ -21,11 +21,22 @@ + + - 买书订单 + 全部订单 @@ -33,17 +44,6 @@ - - - - 卖书订单 - - - - {{ item.name }} - - - @@ -212,18 +212,17 @@ // }, orderStatusList: { buyOrderStatusList:[ - { name: '待付款', icon: 'iconfont icon-daifukuan', status: 10 }, - { name: '待发货', icon: 'iconfont icon-daifahuo', status: 30 }, - { name: '待收货', icon: 'iconfont icon-daishouhuo', status: 40 }, - { name: '退款/售后', icon: 'iconfont icon-shouhou', status: 50 } - ], - saleOrderStatusList:[ - { name: '待初审', icon: 'iconfont icon-shenhetijiao', status: 10 }, - { name: '待取件', icon: 'iconfont icon-qujian', status: 30 }, - { name: '待审核', icon: 'iconfont icon-shengpi', status: 40 }, - { name: '待到款', icon: 'iconfont icon-shoukuan-', status: 50 } + { name: '已完成', icon: 'iconfont icon-shengpi', status: 10 }, + { name: '未完成', icon: 'iconfont icon-dingdan1', status: 30 }, + { name: '退款', icon: 'iconfont icon-shouhou', status: 40 }, ] }, + // saleOrderStatusList:[ + // { name: '待初审', icon: 'iconfont icon-shenhetijiao', status: 10 }, + // { name: '待取件', icon: 'iconfont icon-qujian', status: 30 }, + // { name: '待审核', icon: 'iconfont icon-shengpi', status: 40 }, + // { name: '待到款', icon: 'iconfont icon-shoukuan-', status: 50 } + // ], currentIndex: 0, list: [{ icon: '/static/images/user/class-01.png',