diff --git a/application/tags.php b/application/tags.php
index 326660071a743277387930d0da856084a274d4d9..69e2a107dc99825fcfc20ea82c66e6cae481421e 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 f502cc26f52228df1aa4e64e1de32cbc26972e94..da5c5a696dc1a68ba488ad356f23ee4ac2a580e7 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 6006a30d3722ee7c526ec356923a1c74f9759d2d..1c4e55b295324a55fcfdfbf0779af05e57c9e612 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 538fdf7ea59b60e4c9e87572e3d0c9688b638be3..70a93400fef6ce99b01901347dcd91424eafb665 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 0c7b37601353dc7d3f8d55896886524d7dd3c30d..4e7285aafe5c18947f9db0f9295a77872696f340 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 b73b1e0a70a8dd818f645b2c1cf179e9d48ed4a5..03c896b811d2723c3869c2217cfc2a33b835b150 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 a99bbd557f2b86a67d5693438719b36be5fbeb2c..c4eb166388e4eeb989bc5656c20d1e54d40c6c43 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
Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouye-icon.png differ
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
Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuandui-icon.png differ
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 4f62825706715377a7f308fb5deb63965c29f8ac..72ce23ba459cec904b201b1d77ea10ed1fa1e51f 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 0000000000000000000000000000000000000000..4687d2511de26db65a987079b5d3303a97bbf534
--- /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 0000000000000000000000000000000000000000..dd7b6551f740c6f60b9dcae7419171fadbef192d
--- /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 0000000000000000000000000000000000000000..72ce53cb7bdb19b32fbddf4561fe231238653b98
--- /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 0000000000000000000000000000000000000000..d60ac28207dc20cc08af6e7a290957d115e51132
--- /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 e7cdb03b0fc1a258485fe6b29dbda197f5299961..1b166946416866a582c214d77721a432c32c2587 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 5e7a909efe954fa91ab47effa5e1bd108b5edc15..3bc753d8bc7decf6999497e9666159b052ee8b0e 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 dbb4d9989c5d7642ff3e59e0f7ca52ac639668c2..c3b7453c5cc9c28f73a7583fb23067903d61845d 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 bc243f2cad2cf3080acbd947e1e563c7f842f136..c9b8824a702f511679bade7249b45124f0c6e8e6 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,