diff --git a/App.vue b/App.vue
index bf7b9e5..fb9005c 100644
--- a/App.vue
+++ b/App.vue
@@ -2,5 +2,5 @@
export default {}
diff --git a/common/api/user.js b/common/api/user.js
index c108c38..5d57bd0 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -56,16 +56,16 @@ export default {
});
},
// 使用帮助&售后政策列表
- getUseHelpList({page, tid}) {
+ getUseHelpList({ page, tid }) {
return vm.$u.post('Member/UseHelpList', {
page: page,
- tid: tid
+ tid: tid,
});
},
// 使用帮助&售后政策详情
getUseHelpInfo({ launch_id }) {
return vm.$u.post('Member/UseHelpInfo', {
- launch_id: launch_id
+ launch_id: launch_id,
});
},
// 标签的列表
@@ -75,11 +75,11 @@ export default {
// 获取地区列表
getAreaList({ pid }) {
return vm.$u.post('Area/areaList', {
- pid: pid
+ pid: pid,
});
},
getArea() {
- return vm.$u.post('Area/getAreaTree')
+ return vm.$u.post('Area/getAreaTree');
},
// 用户收货地址列表
getAddressList() {
@@ -168,7 +168,7 @@ export default {
getPointslogList() {
return vm.$u.post('member/pointslogList');
},
- // 收藏列表 商品 不传值;店铺 type: 2
+ // 收藏列表 商品 不传值;店铺 type: 2
getFavoritesList({ type = undefined } = {}) {
let params = {};
if(type) Object.assign(params, {type: type})
@@ -177,7 +177,7 @@ export default {
// 取消收藏(商品/店铺)
removeFavorite({ id }) {
return vm.$u.post('Member/removeFavorite', {
- id: id
+ id: id,
});
},
// 设置-用户信息
@@ -193,6 +193,15 @@ export default {
birthday: birthday,
});
},
+ // 修改绑定手机号
+ changeMemberPhone({ old_mobile, old_code, new_mobile, new_code }) {
+ return vm.$u.post('Member/changeMemberInfo', {
+ old_mobile: old_mobile,
+ old_code: old_code,
+ new_mobile: new_mobile,
+ new_code: new_code,
+ });
+ },
// 设置-关于我们
aboutUsInfo() {
return vm.$u.post('Setting/AboutUsInfo');
diff --git a/pageE/mine/MineInfo.vue b/pageE/mine/MineInfo.vue
index e77c641..f57a396 100644
--- a/pageE/mine/MineInfo.vue
+++ b/pageE/mine/MineInfo.vue
@@ -13,7 +13,7 @@
生日
- {{ userInfo.member_birthday }}
+ {{ userInfo.member_birthday | dateFormat }}
手机号
@@ -21,7 +21,7 @@
等级
- {{ userInfo.member_exppoints }}
+ {{ userInfo.level }}
积分数
@@ -34,6 +34,7 @@
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 4b931fd..f515130 100644
--- a/pages.json
+++ b/pages.json
@@ -315,12 +315,6 @@
{
"root": "pageE",
"pages":[
- {
- "path": "zhibo/index",
- "style": {
- "navigationStyle": "custom"
- }
- },
{
"path": "tool/MineHistory",
"style": {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 11c0ba1..b8a8721 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -13,18 +13,18 @@
{{ userInfo.member_mobile | phoneFormat }}
- 等级:{{ userInfo.member_exppoints }}级
+ 等级:{{ userInfo.level }}级
会员服务
- 99
+ {{ userInfo.member_fav_goods_num }}
商品收藏
- 9
+ {{ userInfo.member_fav_store_num }}
店铺收藏
@@ -36,7 +36,7 @@
积分数
- 9
+ {{ userInfo.member_snsfrend_num }}
关注
@@ -123,7 +123,7 @@
export default {
data() {
return {
- userInfo: {}
+ userInfo: {},
};
},
filters: {
@@ -146,7 +146,6 @@ export default {
})
},
toOtherPage(url) {
- // console.log(url);
uni.navigateTo({
url: '/pageE' + url
});
diff --git a/static/fonts/emoji.ttf b/static/fonts/emoji.ttf
deleted file mode 100644
index 169f0a2..0000000
Binary files a/static/fonts/emoji.ttf and /dev/null differ
diff --git a/static/js/common.js b/static/js/common.js
index d3483a7..cde9abc 100644
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -5,6 +5,7 @@ const common = {
* @return { String } 处理好的富文本
*/
unescapeHTML(temp){
+ if(!temp) return '';
temp = "" + temp;
return temp.replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&").replace(/"/g, '"').replace(/'/g, "'");
},
@@ -16,6 +17,7 @@ const common = {
* @return { String } 格式化日期
*/
timestampToDate({timestamp, spacer = '-', end = 'day'} = {}) {
+ if(!timestamp) return '';
const newDate = new Date(parseInt(timestamp) * 1000);
// const year = newDate.getUTCFullYear();
const year = newDate.getFullYear();