From 7c62f2ddc10119189a1e2f59042b7eec5401946a Mon Sep 17 00:00:00 2001 From: devil Date: Fri, 10 Jan 2020 18:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BC=80=E5=8F=91?= =?UTF-8?q?=EF=BC=8C=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/tags.php | 26 ++-- extend/base/FileUtil.php | 4 + public/appmini/old/alipay/pages/user/user.js | 7 +- public/appmini/old/baidu/pages/user/user.js | 7 +- public/appmini/old/qq/pages/user/user.js | 7 +- public/appmini/old/toutiao/pages/user/user.js | 7 +- public/appmini/old/weixin/app.json | 3 +- .../user-center-shouye-icon.png | Bin 0 -> 2174 bytes .../user-center-tuandui-icon.png | Bin 0 -> 5618 bytes .../plugins/membershiplevelvip/buy/buy.js | 1 + .../membershiplevelvip/tuandui/tuandui.js | 147 ++++++++++++++++++ .../membershiplevelvip/tuandui/tuandui.json | 5 + .../membershiplevelvip/tuandui/tuandui.wxml | 40 +++++ .../membershiplevelvip/tuandui/tuandui.wxss | 29 ++++ .../plugins/membershiplevelvip/user/user.js | 131 +++++++++++++--- .../plugins/membershiplevelvip/user/user.wxml | 88 +++++++---- .../plugins/membershiplevelvip/user/user.wxss | 5 +- public/appmini/old/weixin/pages/user/user.js | 7 +- 18 files changed, 437 insertions(+), 77 deletions(-) create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouye-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuandui-icon.png create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.js create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.json create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxss diff --git a/application/tags.php b/application/tags.php index 326660071..69e2a107d 100755 --- a/application/tags.php +++ b/application/tags.php @@ -32,6 +32,20 @@ return array ( 'log_write' => array ( ), + 'plugins_service_users_center_left_menu_handle' => + array ( + 0 => 'app\\plugins\\wallet\\Hook', + 1 => 'app\\plugins\\membershiplevelvip\\Hook', + 2 => 'app\\plugins\\coupon\\Hook', + 3 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_service_header_navigation_top_right_handle' => + array ( + 0 => 'app\\plugins\\wallet\\Hook', + 1 => 'app\\plugins\\membershiplevelvip\\Hook', + 2 => 'app\\plugins\\coupon\\Hook', + 3 => 'app\\plugins\\distribution\\Hook', + ), 'plugins_css' => array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', @@ -95,18 +109,6 @@ return array ( array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), - 'plugins_service_users_center_left_menu_handle' => - array ( - 0 => 'app\\plugins\\membershiplevelvip\\Hook', - 1 => 'app\\plugins\\coupon\\Hook', - 2 => 'app\\plugins\\distribution\\Hook', - ), - 'plugins_service_header_navigation_top_right_handle' => - array ( - 0 => 'app\\plugins\\membershiplevelvip\\Hook', - 1 => 'app\\plugins\\coupon\\Hook', - 2 => 'app\\plugins\\distribution\\Hook', - ), 'plugins_js' => array ( 0 => 'app\\plugins\\coupon\\Hook', diff --git a/extend/base/FileUtil.php b/extend/base/FileUtil.php index f502cc26f..da5c5a696 100755 --- a/extend/base/FileUtil.php +++ b/extend/base/FileUtil.php @@ -331,6 +331,10 @@ class FileUtil //这里设置客户端的弹出对话框显示的文件名 Header("Content-Disposition: attachment; filename=".$show_name); + // 清除前面输出的内容 + ob_clean(); + flush(); + //一次性将数据传输给客户端 //echo fread($file, filesize($file_path)); //一次只传输1024个字节的数据给客户端 diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js index 6006a30d3..1c4e55b29 100644 --- a/public/appmini/old/alipay/pages/user/user.js +++ b/public/appmini/old/alipay/pages/user/user.js @@ -64,6 +64,11 @@ Page({ }, }); } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.user_name_view || '用户名', + }); + self.get_data(); } } @@ -106,7 +111,7 @@ Page({ user_order_status_list: temp_user_order_status_list, customer_service_tel: data.customer_service_tel || null, common_user_center_notice: data.common_user_center_notice || null, - avatar: (data.avatar != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), + avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), nickname: (data.nickname != null) ? data.nickname : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, diff --git a/public/appmini/old/baidu/pages/user/user.js b/public/appmini/old/baidu/pages/user/user.js index 538fdf7ea..70a93400f 100755 --- a/public/appmini/old/baidu/pages/user/user.js +++ b/public/appmini/old/baidu/pages/user/user.js @@ -62,6 +62,11 @@ Page({ }, }); } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.user_name_view || '用户名', + }); + self.get_data(); } } @@ -104,7 +109,7 @@ Page({ user_order_status_list: temp_user_order_status_list, customer_service_tel: data.customer_service_tel || null, common_user_center_notice: data.common_user_center_notice || null, - avatar: data.avatar != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar, + avatar: (data.avatar || null) != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar, nickname: data.nickname != null ? data.nickname : this.data.nickname, message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, diff --git a/public/appmini/old/qq/pages/user/user.js b/public/appmini/old/qq/pages/user/user.js index 0c7b37601..4e7285aaf 100755 --- a/public/appmini/old/qq/pages/user/user.js +++ b/public/appmini/old/qq/pages/user/user.js @@ -57,6 +57,11 @@ Page({ }, }); } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.user_name_view || '用户名', + }); + self.get_data(); } } @@ -99,7 +104,7 @@ Page({ user_order_status_list: temp_user_order_status_list, customer_service_tel: data.customer_service_tel || null, common_user_center_notice: data.common_user_center_notice || null, - avatar: (data.avatar != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), + avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), nickname: (data.nickname != null) ? data.nickname : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, diff --git a/public/appmini/old/toutiao/pages/user/user.js b/public/appmini/old/toutiao/pages/user/user.js index b73b1e0a7..03c896b81 100755 --- a/public/appmini/old/toutiao/pages/user/user.js +++ b/public/appmini/old/toutiao/pages/user/user.js @@ -56,6 +56,11 @@ Page({ }, }); } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.user_name_view || '用户名', + }); + self.get_data(); } } @@ -98,7 +103,7 @@ Page({ user_order_status_list: temp_user_order_status_list, customer_service_tel: data.customer_service_tel || null, common_user_center_notice: data.common_user_center_notice || null, - avatar: (data.avatar != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), + avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), nickname: (data.nickname != null) ? data.nickname : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index a99bbd557..c4eb16638 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -37,7 +37,8 @@ "pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail", "pages/plugins/membershiplevelvip/shouyi/shouyi", "pages/plugins/membershiplevelvip/tongji/tongji", - "pages/plugins/membershiplevelvip/tuiguang/tuiguang" + "pages/plugins/membershiplevelvip/tuiguang/tuiguang", + "pages/plugins/membershiplevelvip/tuandui/tuandui" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouye-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouye-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..84c8a2a8b5ba9af891fc27abde0793d204ed19ce GIT binary patch literal 2174 zcmV-^2!Z#BP)xI43IWqRE13pltcjWfUy&VuS&`@js!5GN%u|!l-L7l34`!Vv531r znMYeCgyR?Tn7%&T3C2}Pg%WEZtzfW&y9@K^E;r#*3;8ZGaAy*s#1=@qFscxe3MH06 z!oo;0l-L1L1tY0YVg*Dsj3h#d4Uni{Bn?U|fJ6-=Nl>~Dq*E}G0;Q`!!oo0ZKA0U? zL^!{6qs~}L25e!`53L?X#rcxBYd{phmq_?e8Tta;JQMFUQHsDt^iR21CURC z<@2j$AiP%jdj<&S0_X=YLs;}y(x7x4h)Ng?yi%~}(pu4L{OKn#5LWu;3 zN*DyZm$&HjFfgiRr#{ICeKePT^6RS`)0c7}Dq(=JN@VCXzXC>K*J&t9fvAK*!0Nn3 zr$!;N^f@KR<90EgCt$1Bx~)z^Q3gaM3;=6{MW;jsL;9WiB#++ZKqh;6crFp@6ci;u zRKg(OgSczCoSTA{@I1gghfv! zLFAw@s(|7NL=}vnjZ3P1SST%lXc+Bvi!e}{0?{zqgE8;~pv_G~u0YHz&j$_MCk%?L z)y}1GO&EHmTa6R~?#NqoZ+)v9fS5Lq1+W^ZTM=0PQbN;hWJ6C*H7#ldg&F4*GPJz5 zrUoFBY<`4+8|uT+Fxm&y3qc@WI{>ixcpZa?gyTe7q}*uWN-7XB_Q z+OH`P)8+#KY-=b;ct)h@>Y*!H^er=U{IuJ4Z5oEL`8o7$HG)A?*5n)??=aRkOjp3- zf<<$p4}0j=kg|CZ0ki8{Xb`5XOVc`6Ao8E4&A$QIcTmA0@DQ-usLdR&0b@|UkTLyN z#QvYnC#iYqXh`ZQo8KVd!ny`*XUF|AxYn-OM*eP#5q14CX%DKy0N2+^zybg=CDa~r zfyH4>bBH|QahKV$Z9?v4>cPXbxdDJr8D19_&1eZ^`br+QV>4DWaDq>#17;dXAjN*{ zBb@qinl`rtQpqE7LG#i;?g3~Z{uLtwm*?lw3ocWeyOV}_(Z#I(11}m#StNNA-3pB{ z44d3wxF&V~j7wK!gXT^Rq^w>T9YQ5x4WtY}r4AZMkSU>wtp=h%M3pWy5S3~w@TGw$ z5K*NI4Me4y3VdlG3Pe=tLIY8$rUG9YhyoE+y69;jrp?z7FqsMCz&IMf$U1Sifv}Mn zo8_L9POOsbNg$`IQ=eVTBsNYfLlq4X9In+pIY4v0utCDQ)B?qKG4WnIo$FDy!FAR!bm zZI)Y=_o}$~#~6-r>t<7R!+%T9lNa-$PCw);(mgANe+!HD4iS!P(ViJ0si*h|Dpr21 zr7Xo}VbS;?f|@pO0x+&xhWl`2;Trlnhz~E@o&hpxAx~!myT6whV7jV`SU+v~`C@|? zfcoXObtW>@vnf+A^x>ees!U9h|VDayI*s2okIdhsUMvL5X;L{=MXQ2^rI73 zh2k@1<@od3*Q7KI6Y_INzJE}1Bw>V1TEydd7rq>5Fkz!e(=qJ|5cWQ#^b-)(%2j_4 zB?&-Wb}f5;w!9Ura6oeW02sH_R-p0)P~3qu#8-ay@t{c4t=$?S69C9X2qS6(sBC)N zY5-f?4Qyc4MexQjY)lR?2Eds5O|JlU%B}vwqTN$iz{*065LuU*<=a5GFJQgxnJajO z+g`;!OEGR28M@!6wX0cZAku5f=9dY$BupT_%ElOo+mBrOYEzw&5+Ks2oKGDC56Okl z?F8bhObmg@1>J^&o4tPO!dLskK7OySL@tQ_w;!`gpXD$xtzqS$->90|#RUjqBOH7v zf9qtA;aH+_A-A#-5>{(nzN~--60@G5fy4~R|2g9Mu=U9%_5c6?07*qoM6N<$f`iJ; Ae*gdg literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuandui-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuandui-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f25c6e9310ea60c78c903126b7d5ef2413b67881 GIT binary patch literal 5618 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 M07*qoM6N<$f(ae#;{X5v literal 0 HcmV?d00001 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 4f6282570..72ce23ba4 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js @@ -118,6 +118,7 @@ Page({ // 请求生成支付订单 var self = this; + self.setData({ submit_disabled_status: true }); wx.showLoading({ title: "处理中..." }); wx.request({ url: app.get_request_url("create", "buy", "membershiplevelvip"), diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.js new file mode 100644 index 000000000..4687d2511 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.js @@ -0,0 +1,147 @@ +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, + }, + + onLoad(params) { + this.setData({ + params: params, + }); + 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 + }); + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "team", "membershiplevelvip"), + method: "POST", + data: { + page: this.data.data_page, + }, + 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(); + }, + + // 头像查看 + avatar_event(e) { + var value = e.currentTarget.dataset.value || null; + if (value != null) + { + wx.previewImage({ + current: value, + urls: [value] + }); + } else { + app.showToast('头像地址有误'); + } + }, +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.json new file mode 100644 index 000000000..dd7b6551f --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.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/tuandui/tuandui.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxml new file mode 100644 index 000000000..72ce53cb7 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxml @@ -0,0 +1,40 @@ + + + + + + {{item.user_name_view || ''}} + + + + 消费金额 + {{item.order_total}} + 元 + + + 下级消费 + {{item.find_order_total}} + 元 + + + 下级用户 + {{item.referrer_count}} + 人 + + + 加入时间 + {{item.add_time_time}} + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxss new file mode 100644 index 000000000..d60ac2820 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxss @@ -0,0 +1,29 @@ +.scroll-box { + height: 100vh; +} +.data-list .item .base { + padding: 15rpx 10rpx; +} +.data-list .item .base .avatar { + width: 60rpx; + height: 60rpx; + border-radius: 50%; +} +.data-list .item .base .nickname { + margin-top: 10rpx; +} +.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 e7cdb03b0..1b1669464 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js @@ -8,30 +8,10 @@ Page({ user_vip: null, avatar: app.data.default_user_head_src, nickname: "用户名", + submit_disabled_status: false, // 导航 - nav_list: [ - { - icon: "/images/plugins/membershiplevelvip/user-center-order-icon.png", - title: "开通订单", - url: "/pages/plugins/membershiplevelvip/order/order", - }, - { - icon: "/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png", - title: "推广返利", - url: "/pages/plugins/membershiplevelvip/tuiguang/tuiguang", - }, - { - icon: "/images/plugins/membershiplevelvip/user-center-shouyi-icon.png", - title: "收益明细", - url: "/pages/plugins/membershiplevelvip/shouyi/shouyi", - }, - { - icon: "/images/plugins/membershiplevelvip/user-center-tongji-icon.png", - title: "数据统计", - url: "/pages/plugins/membershiplevelvip/tongji/tongji", - } - ], + nav_list: [], }, onLoad(params) { @@ -65,6 +45,11 @@ Page({ }, }); } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.user_name_view || '用户名', + }); + self.get_data(); } } @@ -83,13 +68,67 @@ Page({ wx.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + var data_base = data.base || null; + var user_vip = data.user_vip || null; self.setData({ - data_base: data.base || null, - user_vip: data.user_vip || null, + data_base: data_base, + user_vip: user_vip, + avatar: (user_vip != null && (user_vip.icon || null) == null) ? self.data.avatar : user_vip.icon, data_list_loding_msg: '', data_list_loding_status: 0, data_bottom_line_status: false, }); + + // 导航处理 + var nav_list = []; + if (data_base != null) + { + // 开启会员购买 + if ((data_base.is_user_buy || 0) == 1) + { + nav_list.push({ + icon: "/images/plugins/membershiplevelvip/user-center-order-icon.png", + title: "开通订单", + url: "/pages/plugins/membershiplevelvip/order/order", + }); + + // 开启返佣 + if ((data_base.is_commission || 0) == 1) + { + nav_list.push({ + icon: "/images/plugins/membershiplevelvip/user-center-shouyi-icon.png", + title: "收益明细", + url: "/pages/plugins/membershiplevelvip/shouyi/shouyi", + }); + } + + // 开启推广 + if ((data_base.is_propaganda || 0) == 1) { + nav_list.push({ + icon: "/images/plugins/membershiplevelvip/user-center-tuandui-icon.png", + title: "我的团队", + url: "/pages/plugins/membershiplevelvip/tuandui/tuandui", + }); + nav_list.push({ + icon: "/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png", + title: "推广返利", + url: "/pages/plugins/membershiplevelvip/tuiguang/tuiguang", + }); + nav_list.push({ + icon: "/images/plugins/membershiplevelvip/user-center-tongji-icon.png", + title: "数据统计", + url: "/pages/plugins/membershiplevelvip/tongji/tongji", + }); + } + + nav_list.push({ + icon: "/images/plugins/membershiplevelvip/user-center-shouye-icon.png", + title: "会员首页", + url: "/pages/plugins/membershiplevelvip/index/index", + }); + } + } + self.setData({ nav_list: nav_list }); } else { self.setData({ data_bottom_line_status: false, @@ -134,4 +173,48 @@ Page({ this.setData({ avatar: app.data.default_user_head_src }); }, + // 连续开通会员事件 + uservip_renew_event(e) { + var self = this; + wx.showModal({ + title: '温馨提示', + content: '按照原时长和费用续费，确定继续吗？', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + if (result.confirm) { + // 请求生成支付订单 + self.setData({ submit_disabled_status: true }); + wx.showLoading({ title: "处理中..." }); + wx.request({ + url: app.get_request_url("renew", "buy", "membershiplevelvip"), + method: "POST", + data: {}, + dataType: "json", + header: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + wx.hideLoading(); + self.setData({ submit_disabled_status: false }); + if (res.data.code == 0) { + // 进入以后会员中心并发起支付 + wx.redirectTo({ + url: '/pages/plugins/membershiplevelvip/order/order?is_pay=1&order_id=' + res.data.data.id, + }); + } else { + if (app.is_login_check(res.data, self, 'uservip_renew_event')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + self.setData({ submit_disabled_status: false }); + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + } + }, + }); + }, + }); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml index 5e7a909ef..3bc753d8b 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml @@ -5,43 +5,61 @@ {{nickname}} - VIP1 - - - 有效期 - {{user_vip.permanent_value}} - {{user_vip.permanent_unit}} - - - - 会员已过期或未开通 - - - - - - 有效期 - {{user_vip.surplus_time_number}} - {{user_vip.surplus_time_unit}} - - - - - - + + + {{user_vip.level_name}} + + + 有效期 + {{user_vip.permanent_value}} + {{user_vip.permanent_unit}} + + + + 会员已过期或未开通 - + + + 有效期 + {{user_vip.surplus_time_number}} + {{user_vip.surplus_time_unit}} + + + + + + + + + + + + + + + + + + {{user_vip.level_name}} + + + + + + + + - + - + @@ -55,13 +73,17 @@ - - - - {{item}} + + + + + + {{item}} + + - - + + diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss index dbb4d9989..c3b7453c5 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss @@ -11,8 +11,9 @@ padding-bottom: 30rpx; } .head-item .avatar { - width: 160rpx; - height: 160rpx; + width: 140rpx; + height: 140rpx; + padding: 20rpx; border-radius: 50%; border: 1px solid #3d3c3c; } diff --git a/public/appmini/old/weixin/pages/user/user.js b/public/appmini/old/weixin/pages/user/user.js index bc243f2ca..c9b8824a7 100755 --- a/public/appmini/old/weixin/pages/user/user.js +++ b/public/appmini/old/weixin/pages/user/user.js @@ -57,6 +57,11 @@ Page({ }, }); } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.user_name_view || '用户名', + }); + self.get_data(); } } @@ -99,7 +104,7 @@ Page({ user_order_status_list: temp_user_order_status_list, customer_service_tel: data.customer_service_tel || null, common_user_center_notice: data.common_user_center_notice || null, - avatar: (data.avatar != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), + avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), nickname: (data.nickname != null) ? data.nickname : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, -- GitLab