From 7a3bfc390e7b21895061c9d78254a8c3ad06fd26 Mon Sep 17 00:00:00 2001 From: devil Date: Tue, 7 Jan 2020 20:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user-order-detail/user-order-detail.js | 2 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-order-detail/user-order-detail.js | 2 +- public/appmini/old/weixin/app.js | 3 +- public/appmini/old/weixin/app.json | 7 +- .../appmini/old/weixin/pages/index/index.json | 1 + .../plugins/membershiplevelvip/buy/buy.json | 3 +- .../order-detail/order-detail.js | 91 +++++++++++++++++++ .../order-detail/order-detail.json | 4 + .../order-detail/order-detail.wxml | 24 +++++ .../order-detail/order-detail.wxss | 25 +++++ .../plugins/membershiplevelvip/order/order.js | 74 ++++----------- .../membershiplevelvip/order/order.json | 1 + .../membershiplevelvip/order/order.wxml | 11 +-- .../membershiplevelvip/order/order.wxss | 21 ++++- .../plugins/membershiplevelvip/user/user.json | 3 +- .../user-order-detail/user-order-detail.js | 2 +- .../appmini/old/weixin/pages/user/user.json | 3 +- 19 files changed, 202 insertions(+), 79 deletions(-) create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.js create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.json create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxss diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js index a611904ac..bf4c5939b 100644 --- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js @@ -64,7 +64,7 @@ Page({ {name: "支付时间", value: data.data.pay_time || ''}, {name: "发货时间", value: data.data.delivery_time || ''}, {name: "收货时间", value: data.data.collect_time || ''}, - {name: "取消时间", value: data.data.close_time || ''}, + {name: "取消时间", value: data.data.cancel_time || ''}, {name: "关闭时间", value: data.data.close_time || ''}, ], extension_data: data.data.extension_data || [], diff --git a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js index 34ede0dc0..4bf3a428e 100755 --- a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js @@ -61,7 +61,7 @@ Page({ {name: "支付时间", value: data.data.pay_time || ''}, {name: "发货时间", value: data.data.delivery_time || ''}, {name: "收货时间", value: data.data.collect_time || ''}, - {name: "取消时间", value: data.data.close_time || ''}, + {name: "取消时间", value: data.data.cancel_time || ''}, {name: "关闭时间", value: data.data.close_time || ''}, ], extension_data: data.data.extension_data || [], diff --git a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js index 13650e392..217ff0b31 100755 --- a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js @@ -62,7 +62,7 @@ Page({ {name: "支付时间", value: data.data.pay_time || ''}, {name: "发货时间", value: data.data.delivery_time || ''}, {name: "收货时间", value: data.data.collect_time || ''}, - {name: "取消时间", value: data.data.close_time || ''}, + {name: "取消时间", value: data.data.cancel_time || ''}, {name: "关闭时间", value: data.data.close_time || ''}, ], extension_data: data.data.extension_data || [], diff --git a/public/appmini/old/toutiao/pages/user-order-detail/user-order-detail.js b/public/appmini/old/toutiao/pages/user-order-detail/user-order-detail.js index b3655928f..9dc71af3f 100755 --- a/public/appmini/old/toutiao/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/toutiao/pages/user-order-detail/user-order-detail.js @@ -62,7 +62,7 @@ Page({ {name: "支付时间", value: data.data.pay_time || ''}, {name: "发货时间", value: data.data.delivery_time || ''}, {name: "收货时间", value: data.data.collect_time || ''}, - {name: "取消时间", value: data.data.close_time || ''}, + {name: "取消时间", value: data.data.cancel_time || ''}, {name: "关闭时间", value: data.data.close_time || ''}, ], extension_data: data.data.extension_data || [], diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 01ef8f136..ccc75bec3 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -66,12 +66,13 @@ App({ "membervip": "会员VIP", "membervip_buy": "开通时长", "membervip_order": "开通订单", + "membervip_order_detail": "订单详情", }, // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - request_url: 'https://dev.shopxo.net/', + // request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index 01dcc5b14..77c760dc4 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,6 +1,5 @@ { - "pages": [ - + "pages": ["pages/plugins/membershiplevelvip/user/user", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -32,7 +31,9 @@ "pages/plugins/coupon/user/user", "pages/plugins/membershiplevelvip/index/index", "pages/plugins/membershiplevelvip/buy/buy", - "pages/plugins/membershiplevelvip/user/user" + + "pages/plugins/membershiplevelvip/order/order", + "pages/plugins/membershiplevelvip/order-detail/order-detail" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/weixin/pages/index/index.json b/public/appmini/old/weixin/pages/index/index.json index facc6d737..ffba6f8db 100755 --- a/public/appmini/old/weixin/pages/index/index.json +++ b/public/appmini/old/weixin/pages/index/index.json @@ -2,6 +2,7 @@ "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#d2364c", "backgroundColorTop": "#d2364c", + "backgroundColorBottom": "#f5f5f5", "usingComponents": { "component-icon-nav": "/components/icon-nav/icon-nav", "component-banner": "/components/slider/slider" diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json index d7bf94c8d..a2ec362d4 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json @@ -1,5 +1,6 @@ { "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#1d1611", - "backgroundColor": "#1d1611" + "backgroundColorTop": "#1d1611", + "backgroundColorBottom": "#f5f5f5" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.js new file mode 100644 index 000000000..d74d9697d --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.js @@ -0,0 +1,91 @@ +const app = getApp(); +Page({ + data: { + params: null, + data_list_loding_status: 1, + data_list_loding_msg: '', + data_bottom_line_status: false, + + detail: null, + detail_list: [], + }, + + onLoad(params) { + //params['id'] = 1; + this.setData({ params: params }); + this.init(); + }, + + onShow() { + wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_order_detail }); + }, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("detail", "order", "membershiplevelvip"), + method: "POST", + data: { + id: this.data.params.id + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + detail: data.data, + detail_list: [ + { name: "订单号", value: data.data.payment_user_order_no || '' }, + { name: "开通时长", value: data.data.period_value+' '+data.data.period_unit }, + { name: "订单状态", value: data.data.status_name || '' }, + { name: "结算状态", value: data.data.settlement_status_name || '' }, + { name: "类型", value: data.data.type_name || '' }, + { name: "订单金额", value: data.data.price || '' }, + { name: "支付金额", value: (data.data.pay_price <= 0) ? '' : (data.data.pay_price || '') }, + { name: "支付方式", value: data.data.payment_name || '' }, + { name: "创建时间", value: data.data.add_time_time || '' }, + { name: "更新时间", value: data.data.upd_time || '' }, + ], + + data_list_loding_status: 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.json new file mode 100644 index 000000000..4f38a7a1c --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.json @@ -0,0 +1,4 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#1d1611" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml new file mode 100644 index 000000000..2f3d22e04 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml @@ -0,0 +1,24 @@ + + + + + {{item.name}} + {{item.value}} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxss new file mode 100644 index 000000000..3db968d61 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxss @@ -0,0 +1,25 @@ +.panel-item .panel-title { + background: #fff; + font-weight: bold; + padding: 15rpx; + border-bottom: 2px solid #eee; + font-size: 34rpx; +} +.panel-item .panel-content .item { + padding: 20rpx 0; +} +.panel-item .panel-content .item:last-child { + border: 0; +} +.panel-item .panel-content .item .title { + width: 25%; + padding-left: 20rpx; +} +.panel-item .panel-content .item .content { + width: calc(75% - 50rpx); + padding-left: 20rpx; + min-height: 46rpx; +} +.panel-item .panel-content .item view { + line-height: 46rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js index 2e4acb539..cbd567a29 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js @@ -92,6 +92,7 @@ Page({ data: { page: this.data.data_page, status: order_status, + is_more: 1, }, dataType: "json", success: res => { @@ -209,7 +210,7 @@ Page({ wx.showLoading({ title: "请求中..." }); wx.request({ - url: app.get_request_url("pay", "order"), + url: app.get_request_url("pay", "buy", "membershiplevelvip"), method: "POST", data: { id: order_id, @@ -262,25 +263,8 @@ Page({ order_item_pay_success_handle(index) { // 数据设置 var temp_data_list = this.data.data_list; - switch (parseInt(temp_data_list[index]['order_model'])) { - // 销售模式 - case 0: - temp_data_list[index]['status'] = 2; - temp_data_list[index]['status_name'] = '待发货'; - break; - - // 自提模式 - case 2: - temp_data_list[index]['status'] = 2; - temp_data_list[index]['status_name'] = '待取货'; - break; - - // 虚拟模式 - case 3: - temp_data_list[index]['status'] = 3; - temp_data_list[index]['status_name'] = '待收货'; - break; - } + temp_data_list[index]['status'] = 1; + temp_data_list[index]['status_name'] = '已支付'; this.setData({ data_list: temp_data_list }); }, @@ -301,7 +285,7 @@ Page({ wx.showLoading({ title: "处理中..." }); wx.request({ - url: app.get_request_url("cancel", "order"), + url: app.get_request_url("cancel", "order", "membershiplevelvip"), method: "POST", data: { id: id }, dataType: "json", @@ -309,7 +293,7 @@ Page({ wx.hideLoading(); if (res.data.code == 0) { var temp_data_list = this.data.data_list; - temp_data_list[index]['status'] = 5; + temp_data_list[index]['status'] = 2; temp_data_list[index]['status_name'] = '已取消'; this.setData({ data_list: temp_data_list }); @@ -328,11 +312,11 @@ Page({ }); }, - // 收货 - collect_event(e) { + // 删除 + delete_event(e) { wx.showModal({ title: "温馨提示", - content: "请确认已收到货物或已完成，操作后不可恢复，确定继续吗?", + content: "删除后不可恢复，确定继续吗?", confirmText: "确认", cancelText: "不了", success: result => { @@ -345,7 +329,7 @@ Page({ wx.showLoading({ title: "处理中..." }); wx.request({ - url: app.get_request_url("collect", "order"), + url: app.get_request_url("delete", "order", "membershiplevelvip"), method: "POST", data: { id: id }, dataType: "json", @@ -353,9 +337,14 @@ Page({ wx.hideLoading(); if (res.data.code == 0) { var temp_data_list = this.data.data_list; - temp_data_list[index]['status'] = 4; - temp_data_list[index]['status_name'] = '已完成'; + temp_data_list.splice(index, 1); this.setData({ data_list: temp_data_list }); + if (temp_data_list.length == 0) { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } app.showToast(res.data.msg, "success"); } else { @@ -372,11 +361,6 @@ Page({ }); }, - // 催催 - rush_event(e) { - app.showToast("催促成功", "success"); - }, - // 导航事件 nav_event(e) { this.setData({ @@ -385,26 +369,4 @@ Page({ }); this.get_data_list(1); }, - - // 售后订单事件 - orderaftersale_event(e) { - var oid = e.currentTarget.dataset.oid || 0; - var did = e.currentTarget.dataset.did || 0; - if (oid == 0 || did == 0) { - app.showToast("参数有误"); - return false; - } - - // 进入售后页面 - wx.navigateTo({ - url: "/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=" + oid + "&did=" + did - }); - }, - - // 订单评论 - comments_event(e) { - wx.navigateTo({ - url: "/pages/user-order-comments/user-order-comments?id=" + e.currentTarget.dataset.value - }); - }, -}); +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json index 7d179bfd5..832ef162d 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json @@ -1,5 +1,6 @@ { "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#1d1611", "usingComponents": { "component-popup": "/components/popup/popup" } diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml index c7b81c87d..46bac785e 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml @@ -1,8 +1,7 @@ - {{item.name}} - {{item.name}} + {{item.name}} @@ -36,15 +35,15 @@ 元 - 结算状态： + 结算状态 {{item.settlement_status_name}} - - - + + + diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss index b394cac6a..e81dfd3bf 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss @@ -9,15 +9,15 @@ .nav .item { width: 20%; } +.nav .active { + color: #1d1611; +} /* * 列表 */ .scroll-box { - height: calc(100vh - 80rpx); -} -.data-list { - + height: calc(100vh - 80rpx); } .data-list .item .base, .data-list .item .content { @@ -27,7 +27,7 @@ line-height: 50rpx; } .data-list .item .content .multi-text .title { - margin-right: 20rpx; + margin-right: 30rpx; } .data-list .item .content .multi-text .value { font-weight: 500; @@ -38,6 +38,17 @@ .data-list .item .operation { padding: 20rpx 10rpx; } +.data-list .item .submit-cancel { + border: 1px solid #f7c3b3; + color: #f7c3b3 !important; +} +.data-list .item .submit-delete { + border: 1px solid #dc7f7f; + color: #dc7f7f !important; +} +.data-list .item .operation button:not(:first-child) { + margin-left: 30rpx; +} /** * 支付方式 diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json index 13fbbe252..a2ec362d4 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json @@ -1,5 +1,6 @@ { "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#1d1611", - "backgroundColorTop": "#1d1611" + "backgroundColorTop": "#1d1611", + "backgroundColorBottom": "#f5f5f5" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js index fc9d7ada0..10c1922da 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js @@ -62,7 +62,7 @@ Page({ {name: "支付时间", value: data.data.pay_time || ''}, {name: "发货时间", value: data.data.delivery_time || ''}, {name: "收货时间", value: data.data.collect_time || ''}, - {name: "取消时间", value: data.data.close_time || ''}, + {name: "取消时间", value: data.data.cancel_time || ''}, {name: "关闭时间", value: data.data.close_time || ''}, ], extension_data: data.data.extension_data || [], diff --git a/public/appmini/old/weixin/pages/user/user.json b/public/appmini/old/weixin/pages/user/user.json index 69994ec5d..11cb46fc3 100755 --- a/public/appmini/old/weixin/pages/user/user.json +++ b/public/appmini/old/weixin/pages/user/user.json @@ -1,7 +1,8 @@ { "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#d2364c", - "backgroundColor": "#d2364c", + "backgroundColorTop": "#d2364c", + "backgroundColorBottom": "#f5f5f5", "usingComponents": { "component-badge": "/components/badge/badge" } -- GitLab