From 5e09f5dc8f00ec4ba423d39d32089da7c48f87d1 Mon Sep 17 00:00:00 2001 From: devil Date: Wed, 8 Jan 2020 17:25:22 +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 --- public/appmini/old/weixin/app.js | 4 - public/appmini/old/weixin/app.json | 8 +- .../plugins/membershiplevelvip/buy/buy.js | 4 +- .../plugins/membershiplevelvip/buy/buy.json | 3 +- .../plugins/membershiplevelvip/buy/buy.wxml | 2 +- .../plugins/membershiplevelvip/index/index.js | 4 +- .../membershiplevelvip/index/index.json | 3 +- .../order-detail/order-detail.js | 6 +- .../order-detail/order-detail.json | 3 +- .../plugins/membershiplevelvip/order/order.js | 4 +- .../membershiplevelvip/order/order.json | 1 + .../membershiplevelvip/order/order.wxml | 2 +- .../shouyi-detail/shouyi-detail.js | 86 +++++++++ .../shouyi-detail/shouyi-detail.json | 5 + .../shouyi-detail/shouyi-detail.wxml | 24 +++ .../shouyi-detail/shouyi-detail.wxss | 25 +++ .../membershiplevelvip/shouyi/shouyi.js | 166 ++++++++++++++++++ .../membershiplevelvip/shouyi/shouyi.json | 5 + .../membershiplevelvip/shouyi/shouyi.wxml | 49 ++++++ .../membershiplevelvip/shouyi/shouyi.wxss | 37 ++++ .../plugins/membershiplevelvip/user/user.js | 4 +- .../plugins/membershiplevelvip/user/user.json | 3 +- 22 files changed, 419 insertions(+), 29 deletions(-) create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.js create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.json create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxss diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index ccc75bec3..ef3ecaa91 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -63,10 +63,6 @@ App({ "coupon": "领劵中心", "user_coupon": "优惠劵", "extraction_address": "自提地址", - "membervip": "会员VIP", - "membervip_buy": "开通时长", - "membervip_order": "开通订单", - "membervip_order_detail": "订单详情", }, // 请求地址 diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index 77c760dc4..ae8a67512 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,5 +1,6 @@ { - "pages": ["pages/plugins/membershiplevelvip/user/user", + "pages": [ + "pages/plugins/membershiplevelvip/user/user", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -31,9 +32,10 @@ "pages/plugins/coupon/user/user", "pages/plugins/membershiplevelvip/index/index", "pages/plugins/membershiplevelvip/buy/buy", - "pages/plugins/membershiplevelvip/order/order", - "pages/plugins/membershiplevelvip/order-detail/order-detail" + "pages/plugins/membershiplevelvip/order-detail/order-detail", + "pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail", + "pages/plugins/membershiplevelvip/shouyi/shouyi" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js index 3d7511ddd..09a8addd3 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js @@ -16,9 +16,7 @@ Page({ this.init(); }, - onShow() { - wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_buy }); - }, + onShow() {}, init() { // 获取数据 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 a2ec362d4..c4071739f 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json @@ -2,5 +2,6 @@ "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#1d1611", "backgroundColorTop": "#1d1611", - "backgroundColorBottom": "#f5f5f5" + "backgroundColorBottom": "#f5f5f5", + "navigationBarTitleText": "开通时长" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml index 4e60fe9e9..4e03bdfaa 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml @@ -2,7 +2,7 @@ - {{item.name}} + {{item.name}} diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js index 9c58190c4..573b367fd 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js @@ -12,9 +12,7 @@ Page({ this.init(); }, - onShow() { - wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip }); - }, + onShow() {}, init() { // 获取数据 diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json index d7bf94c8d..a615566bc 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json @@ -1,5 +1,6 @@ { "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#1d1611", - "backgroundColor": "#1d1611" + "backgroundColor": "#1d1611", + "navigationBarTitleText": "会员VIP" } \ 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 index d74d9697d..27dfbe612 100644 --- 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 @@ -16,9 +16,7 @@ Page({ this.init(); }, - onShow() { - wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_order_detail }); - }, + onShow() {}, init() { var self = this; @@ -43,7 +41,7 @@ Page({ 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.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 || '' }, 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 index 4f38a7a1c..bbfe0c957 100644 --- 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 @@ -1,4 +1,5 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#1d1611" + "navigationBarBackgroundColor": "#1d1611", + "navigationBarTitleText": "订单详情" } \ 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 cbd567a29..4fa70e9de 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js @@ -42,9 +42,7 @@ Page({ this.init(); }, - onShow() { - wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_order }); - }, + onShow() {}, init() { var user = app.get_user_info(this, 'init'); 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 832ef162d..8a4956701 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json @@ -1,6 +1,7 @@ { "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#1d1611", + "navigationBarTitleText": "订单列表", "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 46bac785e..674eac885 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml @@ -5,7 +5,7 @@ - + diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js new file mode 100644 index 000000000..1c93a1fce --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js @@ -0,0 +1,86 @@ +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() {}, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("detail", "profit", "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.total_price || '' }, + { name: "返佣金额", value: data.data.profit_price || '' }, + { name: "当前级别", value: data.data.level_name || '' }, + { name: "结算状态", value: data.data.status_name || '' }, + { name: "返佣规则", value: data.data.commission_rules || '' }, + { 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/shouyi-detail/shouyi-detail.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json new file mode 100644 index 000000000..2f26cd854 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json @@ -0,0 +1,5 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#1d1611", + "navigationBarTitleText": "收益详情" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxml new file mode 100644 index 000000000..2f3d22e04 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-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/shouyi-detail/shouyi-detail.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxss new file mode 100644 index 000000000..3db968d61 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-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/shouyi/shouyi.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.js new file mode 100644 index 000000000..7a3ae732d --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.js @@ -0,0 +1,166 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + nav_status_list: [ + { name: "全部", value: "-1" }, + { name: "待结算", value: "0" }, + { name: "已结算", value: "1" }, + { name: "已失效", value: "2" }, + ], + nav_status_index: 0, + }, + + onLoad(params) { + // 是否指定状态 + var nav_status_index = 0; + if ((params.status || null) != null) { + for (var i in this.data.nav_status_list) { + if (this.data.nav_status_list[i]['value'] == params.status) { + nav_status_index = i; + break; + } + } + } + + this.setData({ + params: params, + nav_status_index: nav_status_index, + }); + this.init(); + }, + + onShow() {}, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + // 参数 + var status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value']; + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "profit", "membershiplevelvip"), + method: "POST", + data: { + page: this.data.data_page, + status: status, + is_more: 1, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data.data_page <= 1) { + var temp_data_list = res.data.data.data; + } else { + var temp_data_list = this.data.data_list; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data.data_page + 1, + }); + + // 是否还有数据 + if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { + this.setData({ data_bottom_line_status: true }); + } else { + this.setData({ data_bottom_line_status: false }); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_list: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.setData({ + data_page: 1 + }); + this.get_data_list(1); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + + // 导航事件 + nav_event(e) { + this.setData({ + nav_status_index: e.currentTarget.dataset.index || 0, + data_page: 1, + }); + this.get_data_list(1); + }, +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.json new file mode 100644 index 000000000..287e89f66 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.json @@ -0,0 +1,5 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#1d1611", + "navigationBarTitleText": "收益明细" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml new file mode 100644 index 000000000..7cc18f8d3 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml @@ -0,0 +1,49 @@ + + + + {{item.name}} + + + + + + + + + {{item.add_time_time}} + {{item.status_name}} + + + + + 订单金额 + {{item.total_price}} + 元 + + + 返佣金额 + {{item.profit_price}} + 元 + + + 当前级别 + {{item.level_name}} + + + 返佣规则 + {{item.commission_rules}} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxss new file mode 100644 index 000000000..7772596d3 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxss @@ -0,0 +1,37 @@ +/* + * 导航 + */ +.nav { + background: #eee; + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 25%; +} +.nav .active { + color: #1d1611; +} + +/* + * 列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list .item .base, +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 30rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js index f7362d6ba..e7cdb03b0 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js @@ -38,9 +38,7 @@ Page({ this.init(); }, - onShow() { - wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip }); - }, + onShow() {}, init(e) { var user = app.get_user_info(this, "init"), 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 a2ec362d4..1678c898b 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json @@ -2,5 +2,6 @@ "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#1d1611", "backgroundColorTop": "#1d1611", - "backgroundColorBottom": "#f5f5f5" + "backgroundColorBottom": "#f5f5f5", + "navigationBarTitleText": "我的会员" } \ No newline at end of file