diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js index fa8969d..851d70c 100644 --- a/apis/interfaces/order.js +++ b/apis/interfaces/order.js @@ -53,11 +53,73 @@ const logistic = id => { }) } +// 退货 +const refund = (id,method,params) => { + return request({ + url: 'mall/orders/' + id + '/refund', + method:method, + data:params + }) +} + +// 退货前置 +const refundpre = (id) => { + return request({ + url: 'mall/orders/' + id + '/refundpre' + }) +} + +// 货款、售后列表 +const refunds = data => { + return request({ + url: 'mall/refunds', + data + }) +} +// 货款、售后详情 +const refundsInfo = id => { + return request({ + url: 'mall/refunds/'+id + }) +} +// 货款、售后j 进度 +const refundsLogs = id => { + return request({ + url: 'mall/refunds/'+id+'/logs' + }) +} +// 物流列表 +const deliverpre = ()=> { + return request({ + url: 'mall/refunds/deliverpre' + }) +} + +// 提交发货接口 + +const refundsDeliver = (id,data) => { + return request({ + url: 'mall/refunds/'+id+'/deliver', + method:'post', + data + }) +} + + + + export { orders, info, del, cancel, sign, - logistic + logistic, + refund, + refundpre, + refunds, + refundsInfo, + refundsLogs, + deliverpre, + refundsDeliver, } diff --git a/pages.json b/pages.json index 47dfa10..9a73ea9 100644 --- a/pages.json +++ b/pages.json @@ -1,301 +1,363 @@ -{ - "pages": [{ - "path": "pages/auth/auth", - "name": "Auth", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } - }, - { - "path": "pages/auth/role", - "name": "AuthRole", - "style": { - "navigationBarTitleText": "角色创建", - "navigationBarBackgroundColor": "#FFF", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "退出登录", - "fontSize": "14", - "width": "80px", - "color": "#34CE98" - }] - } - } - } - }, { - "path": "pages/life/life", - "name": "Life", - "style": { - "navigationBarTitleText": "共力人生", - "navigationStyle": "custom" - } - }, - { - "path": "pages/store/index", - "name": "Store", - "style": { - "navigationBarTitleText": "DT商城", - "enablePullDownRefresh": true, - "app-plus": { - "titleNView": { - "backgroundColor": "#FFFFFF", - "buttons": [{ - "float": "right", - "text": "\ue603", - "fontSrc": "/static/iconfont.ttf", - "color": "#000", - "fontSize": "20px" - }] - } - } - } - }, - { - "path": "pages/user/index", - "name": "User", - "style": { - "navigationBarTitleText": "我的", - "navigationStyle": "custom" - } - }, - { - "path": "pages/setting/setting", - "name": "Setting", - "style": { - "navigationBarTitleText": "设置中心", - "navigationBarBackgroundColor": "#34CE98", - "navigationBarTextStyle": "white" - } - }, - - { - "path": "pages/store/goods", - "name": "StoreGoods", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "详情", - "app-plus": { - "titleNView": { - "backgroundColor": "#FFFFFF", - "type": "transparent" - } - } - } - }, - { - "path": "pages/store/buy", - "name": "StoreBuy", - "style": { - "navigationBarTitleText": "确认订单", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/order/index", - "name": "Order", - "style": { - "navigationBarTitleText": "我的订单", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/order/details", - "name": "OrderDetails", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/address/index", - "name": "Address", - "style": { - "navigationBarTitleText": "收货地址" - } - }, - { - "path": "pages/address/edit", - "name": "AddressEdit", - "style": { - "navigationBarTitleText": "编辑", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/pay/pay", - "name": "Pay", - "style": { - "navigationBarTitleText": "收银台", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/store/list", - "name": "StoreList", - "style": { - "navigationBarTitleText": "商品", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/store/meals", - "name": "StoreMeals", - "style": { - "navigationBarTitleText": "套餐", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/store/search", - "name": "StoreSearch", - "style": { - "navigationBarTitleText": "搜索", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, - { - "path": "pages/refund/list", - "name": "OrderRefund", - "style": { - "navigationBarTitleText": "退换货", - "navigationBarBackgroundColor": "#FFFFFF" - } - },{ - "path": "pages/refund/aftersale", - "name": "AfterSale", - "style": { - "navigationBarTitleText": " 选择售后类型", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/refund/refund_or_exchange_apply", - "name": "RefundOrExchangeApply", - "style": { - "navigationBarTitleText": "退换货申请", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/refund/exchange", - "name": "Exchange", - "style": { - "navigationBarTitleText": "换货", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/account/integral", - "name": "AccountIntegral", - "style": { - "navigationBarTitleText": "共力值", - "navigationBarBackgroundColor": "#34CE98", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/account/dt", - "name": "AccountDt", - "style": { - "navigationBarTitleText": "DT积分", - "navigationBarBackgroundColor": "#34CE98", - "backgroundColorTop": "#34CE98", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "充值", - "width": "60", - "fontSize": "14" - }] - } - } - } - }, { - "path": "pages/account/recharge", - "name": "AccountRecharge", - "style": { - "navigationBarTitleText": "DT积分充值", - "navigationBarBackgroundColor": "#FFFFFF", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "充值记录", - "width": "80", - "fontSize": "14" - }] - } - } - } - }, { - "path": "pages/vip/vip", - "name": "Vip", - "style": { - "navigationBarTitleText": "共力会员", - "navigationBarBackgroundColor": "#242430", - "navigationBarTextStyle": "white", - "backgroundColorTop": "#242430" - } - }, { - "path": "pages/vip/agreement", - "style": { - "navigationBarTitleText": "共力会员协议" - } - }, { - "path": "pages/team/index", - "name": "Team", - "style": { - "navigationBarTitleText": "共力团队", - "enablePullDownRefresh": false - } - - }, - { - "path" : "pages/store/shop/shopDetail", - "name": "ShopDetail", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/store/shop/shopList", - "name": "ShopList", - "style": { - "navigationBarTitleText": "更多店铺", - "navigationBarBackgroundColor": "#FFFFFF", - "enablePullDownRefresh": true - } - } - ], - "tabBar": { - "borderStyle": "white", - "selectedColor": "#34CE98", - "list": [{ - "iconPath": "static/tabBar/tabBar_02.png", - "selectedIconPath": "static/tabBar/tabBar_show_02.png", - "pagePath": "pages/life/life", - "text": "共力人生" - }, { - "iconPath": "static/tabBar/tabBar_02.png", - "selectedIconPath": "static/tabBar/tabBar_show_02.png", - "pagePath": "pages/store/index", - "text": "DT商城" - }, { - "iconPath": "static/tabBar/tabBar_03.png", - "selectedIconPath": "static/tabBar/tabBar_show_03.png", - "pagePath": "pages/user/index", - "text": "我的" - }] - }, - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "ZH健康", - "navigationBarBackgroundColor": "#F3F6FB", - "backgroundColorTop": "#F3F6FB", - "backgroundColorBottom": "#F3F6FB" - }, - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - } +{ + "pages" : [ + { + "path" : "pages/auth/auth", + "name" : "Auth", + "style" : { + "navigationBarTitleText" : "登录", + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/auth/role", + "name" : "AuthRole", + "style" : { + "navigationBarTitleText" : "角色创建", + "navigationBarBackgroundColor" : "#FFF", + "app-plus" : { + "titleNView" : { + "buttons" : [ + { + "text" : "退出登录", + "fontSize" : "14", + "width" : "80px", + "color" : "#34CE98" + } + ] + } + } + } + }, + { + "path" : "pages/life/life", + "name" : "Life", + "style" : { + "navigationBarTitleText" : "共力人生", + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/store/index", + "name" : "Store", + "style" : { + "navigationBarTitleText" : "DT商城", + "enablePullDownRefresh" : true, + "app-plus" : { + "titleNView" : { + "backgroundColor" : "#FFFFFF", + "buttons" : [ + { + "float" : "right", + "text" : "\ue603", + "fontSrc" : "/static/iconfont.ttf", + "color" : "#000", + "fontSize" : "20px" + } + ] + } + } + } + }, + { + "path" : "pages/user/index", + "name" : "User", + "style" : { + "navigationBarTitleText" : "我的", + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/setting/setting", + "name" : "Setting", + "style" : { + "navigationBarTitleText" : "设置中心", + "navigationBarBackgroundColor" : "#34CE98", + "navigationBarTextStyle" : "white" + } + }, + { + "path" : "pages/store/goods", + "name" : "StoreGoods", + "style" : { + "navigationStyle" : "custom", + "navigationBarTitleText" : "详情", + "app-plus" : { + "titleNView" : { + "backgroundColor" : "#FFFFFF", + "type" : "transparent" + } + } + } + }, + { + "path" : "pages/store/buy", + "name" : "StoreBuy", + "style" : { + "navigationBarTitleText" : "确认订单", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/order/index", + "name" : "Order", + "style" : { + "navigationBarTitleText" : "我的订单", + "navigationBarBackgroundColor" : "#FFFFFF", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/order/details", + "name" : "OrderDetails", + "style" : { + "navigationBarTitleText" : "订单详情", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/order/logistics", + "name" : "OrderLogistics", + "style" : { + "navigationBarTitleText" : "物流信息", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/address/index", + "name" : "Address", + "style" : { + "navigationBarTitleText" : "收货地址" + } + }, + { + "path" : "pages/address/edit", + "name" : "AddressEdit", + "style" : { + "navigationBarTitleText" : "编辑", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/pay/pay", + "name" : "Pay", + "style" : { + "navigationBarTitleText" : "收银台", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/store/list", + "name" : "StoreList", + "style" : { + "navigationBarTitleText" : "商品", + "navigationBarBackgroundColor" : "#FFFFFF", + "enablePullDownRefresh" : true + } + }, + { + "path" : "pages/store/meals", + "name" : "StoreMeals", + "style" : { + "navigationBarTitleText" : "套餐", + "navigationBarBackgroundColor" : "#FFFFFF", + "enablePullDownRefresh" : true + } + }, + { + "path" : "pages/store/search", + "name" : "StoreSearch", + "style" : { + "navigationBarTitleText" : "搜索", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/list", + "name" : "OrderRefund", + "style" : { + "navigationBarTitleText" : "退款/售后", + "navigationBarBackgroundColor" : "#FFFFFF", + "enablePullDownRefresh" : true + } + }, + { + "path" : "pages/refund/detail", + "name" : "OrderRefundDetail", + "style" : { + "navigationBarTitleText" : "退货退款详情", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/aftersale", + "name" : "AfterSale", + "style" : { + "navigationBarTitleText" : " 选择售后类型", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/refund_history", + "name" : "RefundHistory", + "style" : { + "navigationBarTitleText" : "售后历史", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/deliver_form", + "name" : "DeliverForm", + "style" : { + "navigationBarTitleText" : "填写物流信息", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/refund_or_exchange_apply", + "name" : "RefundOrExchangeApply", + "style" : { + "navigationBarTitleText" : "退换货申请", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/exchange", + "name" : "Exchange", + "style" : { + "navigationBarTitleText" : "换货", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/refund/refund_money", + "name" : "RefundMoney", + "style" : { + "navigationBarTitleText" : "申请退款", + "navigationBarBackgroundColor" : "#FFFFFF" + } + }, + { + "path" : "pages/account/integral", + "name" : "AccountIntegral", + "style" : { + "navigationBarTitleText" : "共力值", + "navigationBarBackgroundColor" : "#34CE98", + "navigationBarTextStyle" : "white" + } + }, + { + "path" : "pages/account/dt", + "name" : "AccountDt", + "style" : { + "navigationBarTitleText" : "DT积分", + "navigationBarBackgroundColor" : "#34CE98", + "backgroundColorTop" : "#34CE98", + "navigationBarTextStyle" : "white", + "app-plus" : { + "titleNView" : { + "buttons" : [ + { + "text" : "充值", + "width" : "60", + "fontSize" : "14" + } + ] + } + } + } + }, + { + "path" : "pages/account/recharge", + "name" : "AccountRecharge", + "style" : { + "navigationBarTitleText" : "DT积分充值", + "navigationBarBackgroundColor" : "#FFFFFF", + "app-plus" : { + "titleNView" : { + "buttons" : [ + { + "text" : "充值记录", + "width" : "80", + "fontSize" : "14" + } + ] + } + } + } + }, + { + "path" : "pages/vip/vip", + "name" : "Vip", + "style" : { + "navigationBarTitleText" : "共力会员", + "navigationBarBackgroundColor" : "#242430", + "navigationBarTextStyle" : "white", + "backgroundColorTop" : "#242430" + } + }, + { + "path" : "pages/vip/agreement", + "style" : { + "navigationBarTitleText" : "共力会员协议" + } + }, + { + "path" : "pages/team/index", + "name" : "Team", + "style" : { + "navigationBarTitleText" : "共力团队", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/store/shop/shopDetail", + "name" : "ShopDetail", + "style" : { + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/store/shop/shopList", + "name" : "ShopList", + "style" : { + "navigationBarTitleText" : "更多店铺", + "navigationBarBackgroundColor" : "#FFFFFF", + "enablePullDownRefresh" : true + } + } + ], + "tabBar" : { + "borderStyle" : "white", + "selectedColor" : "#34CE98", + "list" : [ + { + "iconPath" : "static/tabBar/tabBar_02.png", + "selectedIconPath" : "static/tabBar/tabBar_show_02.png", + "pagePath" : "pages/life/life", + "text" : "共力人生" + }, + { + "iconPath" : "static/tabBar/tabBar_02.png", + "selectedIconPath" : "static/tabBar/tabBar_show_02.png", + "pagePath" : "pages/store/index", + "text" : "DT商城" + }, + { + "iconPath" : "static/tabBar/tabBar_03.png", + "selectedIconPath" : "static/tabBar/tabBar_show_03.png", + "pagePath" : "pages/user/index", + "text" : "我的" + } + ] + }, + "globalStyle" : { + "navigationBarTextStyle" : "black", + "navigationBarTitleText" : "ZH健康", + "navigationBarBackgroundColor" : "#F3F6FB", + "backgroundColorTop" : "#F3F6FB", + "backgroundColorBottom" : "#F3F6FB" + }, + "easycom" : { + "^u-(.*)" : "uview-ui/components/u-$1/u-$1.vue" + } } diff --git a/pages/order/index.vue b/pages/order/index.vue index aa6f320..c23400d 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -1,188 +1,328 @@ - - - - - diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index 0dc912e..4348f4c 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -6,6 +6,7 @@ + + diff --git a/pages/refund/detail.vue b/pages/refund/detail.vue new file mode 100644 index 0000000..7805f25 --- /dev/null +++ b/pages/refund/detail.vue @@ -0,0 +1,466 @@ + + + + + diff --git a/pages/refund/list.vue b/pages/refund/list.vue index 04f7c0f..cef55f9 100644 --- a/pages/refund/list.vue +++ b/pages/refund/list.vue @@ -1,188 +1,324 @@ - @@ -326,4 +373,74 @@ } } } + + + + // 订单信息 + .info-box { + .info-item { + position: relative; + padding: 40rpx $padding 40rpx 200rpx; + font-size: $title-size-m; + min-height: 40rpx; + text-align: right; + + .radio { + font-size: 28rpx; + font-weight: bold; + } + + .label { + position: absolute; + left: 40rpx; + top: 40rpx; + color: $text-gray; + } + + .info-textarea { + height: 120rpx; + width: 100%; + text-align: left; + font-size: $title-size-m; + } + + .info-textarea-m { + height: 120rpx; + width: 100%; + text-align: left; + font-size: 60rpx; + font-weight: bold; + } + + &::after { + position: absolute; + left: $margin; + right: $margin; + content: " "; + height: 1rpx; + bottom: 0; + background: $border-color; + } + + &:last-child::after { + display: none; + } + + .info-item-title { + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-end; + box-sizing: border-box; + font-size: 28rpx; + font-weight: bold; + + .icons { + padding-top: 2rpx; + font-weight: normal; + margin-left: 10rpx; + } + } + } + } diff --git a/pages/store/goods.vue b/pages/store/goods.vue index b326cb5..52e78eb 100644 --- a/pages/store/goods.vue +++ b/pages/store/goods.vue @@ -27,7 +27,7 @@ - + {{goods.shop.name}} 商品质量:5.0 服务态度:5.0 diff --git a/pages/user/index.vue b/pages/user/index.vue index 3860749..e391a3b 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -77,7 +77,7 @@ 待收货 - + 退换货 diff --git a/static/icon/goods_row.png b/static/icon/goods_row.png new file mode 100644 index 0000000..50dc5c9 Binary files /dev/null and b/static/icon/goods_row.png differ diff --git a/static/icon/icon-back.png b/static/icon/icon-back.png new file mode 100644 index 0000000..ea48c6d Binary files /dev/null and b/static/icon/icon-back.png differ diff --git a/static/icon/icon-exchange.png b/static/icon/icon-exchange.png new file mode 100644 index 0000000..0cfeac7 Binary files /dev/null and b/static/icon/icon-exchange.png differ diff --git a/static/icon/icon-money.png b/static/icon/icon-money.png new file mode 100644 index 0000000..3a30676 Binary files /dev/null and b/static/icon/icon-money.png differ diff --git a/static/icon/reset-info.png b/static/icon/reset-info.png new file mode 100644 index 0000000..06e2ea6 Binary files /dev/null and b/static/icon/reset-info.png differ diff --git a/uni_modules/oct-logistics/components/oct-logistics/oct-logistics.vue b/uni_modules/oct-logistics/components/oct-logistics/oct-logistics.vue index 55a87d7..b37b66b 100644 --- a/uni_modules/oct-logistics/components/oct-logistics/oct-logistics.vue +++ b/uni_modules/oct-logistics/components/oct-logistics/oct-logistics.vue @@ -1,12 +1,12 @@