diff --git a/App.vue b/App.vue
index f1691be3..ad46b95e 100644
--- a/App.vue
+++ b/App.vue
@@ -26,7 +26,9 @@
// 上一页地址缓存key
cache_prev_page_key: 'cache_prev_page_key',
// tab页面切换参数
- cache_page_tabbar_switch_params: 'cache_page_tabbar_switch_params_key',
+ cache_page_tabbar_switch_params: 'cache_page_tabbar_switch_params_key',
+ // 用户基础资料提示间隔key
+ cache_user_base_personal_interval_time_key: 'cache_user_base_personal_interval_time_key',
// 默认用户头像
default_user_head_src: "/static/images/common/user.png",
// 成功圆形提示图片
@@ -54,7 +56,16 @@
// 用户中心菜单默认展示模式(0 九方格, 1 列表)
user_center_nav_show_model_type: 0,
// 商品列表是否展示购物车(0否, 1是)
- is_goods_list_show_cart_opt: 1,
+ is_goods_list_show_cart_opt: 1,
+ // 用户基础信息头像及昵称设置提示数据
+ user_base_personal_setup_data: {
+ // 页面(index 首页、goods-category 商品分类、cart 购物车、 user 用户中心、share 分享)
+ pages: ['index', 'goods-category', 'cart', 'user', 'share'],
+ // 终端(weixin 微信、alipay 支付宝、baidu 百度、qq QQ、toutiao 头条、kuaishou 快手)
+ client: ['weixin'],
+ // 关闭后再次提示间隔时间(单位秒)、默认1800秒30分钟
+ interval_time: 1800,
+ },
// tabbar页面
tabbar_pages: [
"/pages/index/index",
@@ -245,7 +256,7 @@
// 小程序唤醒用户授权
this.user_login(object, method);
// #endif
-
+
// #ifdef H5 || APP
// h5、app登录注册
uni.showModal({
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 688fc16f..576f1cd4 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -100,13 +100,17 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 3decb941..2d5dad41 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -264,6 +264,9 @@
+
+
+
@@ -278,6 +281,7 @@
import componentPopup from "../../components/popup/popup";
import componentBadge from "../../components/badge/badge";
import componentCartParaCurve from '../../components/cart-para-curve/cart-para-curve';
+ import componentUserBase from "../../components/user-base/user-base";
var common_static_url = app.globalData.get_static_url('common');
// 状态栏高度
@@ -335,7 +339,8 @@
componentNoData,
componentPopup,
componentBadge,
- componentCartParaCurve
+ componentCartParaCurve,
+ componentUserBase
},
props: {},
@@ -354,6 +359,11 @@
// 清除tab参数
app.globalData.remove_page_tabbar_switch_params();
+
+ // 用户头像和昵称设置提示
+ if((this.$refs.user_base || null) != null) {
+ this.$refs.user_base.init('goods-category');
+ }
},
// 下拉刷新
@@ -654,7 +664,7 @@
}
var user = app.globalData.get_user_info(this);
if (user != false) {
- // 用户未绑定用户则转到登录页面
+ // 用户未绑定手机则转到登录页面
if (app.globalData.user_is_need_login(user)) {
uni.navigateTo({
url: "/pages/login/login?event_callback=buy_number_event"
@@ -761,7 +771,7 @@
}
var user = app.globalData.get_user_info(this);
if (user != false) {
- // 用户未绑定用户则转到登录页面
+ // 用户未绑定手机则转到登录页面
if (app.globalData.user_is_need_login(user)) {
uni.navigateTo({
url: "/pages/login/login?event_callback=cart_buy_number_event"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e1e068f8..a87bc8f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -232,7 +232,10 @@
-
+
+
+
+
@@ -253,7 +256,8 @@
import componentBlogList from "../../components/blog-list/blog-list";
import componentRealstoreList from "../../components/realstore-list/realstore-list";
import componentShopList from "../../components/shop-list/shop-list";
- import componentGoodsList from "../../components/goods-list/goods-list";
+ import componentGoodsList from "../../components/goods-list/goods-list";
+ import componentUserBase from "../../components/user-base/user-base";
var common_static_url = app.globalData.get_static_url('common');
var static_url = app.globalData.get_static_url('home');
@@ -344,7 +348,8 @@
componentBlogList,
componentRealstoreList,
componentShopList,
- componentGoodsList
+ componentGoodsList,
+ componentUserBase
},
props: {},
@@ -353,7 +358,12 @@
this.init();
// 初始化配置
- this.init_config();
+ this.init_config();
+
+ // 用户头像和昵称设置提示
+ if((this.$refs.user_base || null) != null) {
+ this.$refs.user_base.init('index');
+ }
},
// 下拉刷新
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 89e86781..9663c939 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -15,7 +15,7 @@
昵称*
-
+
生日
@@ -63,7 +63,7 @@
-
+
diff --git a/pages/user/user.vue b/pages/user/user.vue
index ca26672d..8a539a00 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -146,7 +146,10 @@
-
+
+
+
+
@@ -157,7 +160,8 @@
import componentQuickNav from "../../components/quick-nav/quick-nav";
import componentBadge from "../../components/badge/badge";
import componentCopyright from "../../components/copyright/copyright";
- import componentOnlineService from "../../components/online-service/online-service";
+ import componentOnlineService from "../../components/online-service/online-service";
+ import componentUserBase from "../../components/user-base/user-base";
var common_static_url = app.globalData.get_static_url('common');
var static_url = app.globalData.get_static_url('user');
@@ -209,7 +213,8 @@
componentQuickNav,
componentBadge,
componentCopyright,
- componentOnlineService
+ componentOnlineService,
+ componentUserBase
},
props: {},
@@ -275,9 +280,15 @@
// 分享菜单处理
app.globalData.page_share_handle();
- } else {
+ } else {
+ // 获取基础数据
this.set_user_base(user);
- this.get_data();
+ this.get_data();
+
+ // 用户头像和昵称设置提示
+ if((this.$refs.user_base || null) != null) {
+ this.$refs.user_base.init('user');
+ }
}
} else {
uni.stopPullDownRefresh();