diff --git a/.gitignore b/.gitignore
index 39127f2..d7067c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,13 @@
/unpackage
node_modules/
.vscode/
-.hbuilderx/
\ No newline at end of file
+.hbuilderx/
+/.idea/inspectionProfiles/Project_Default.xml
+/.idea/.gitignore
+/.idea/cashier_wx.iml
+/.idea/jsLibraryMappings.xml
+/.idea/misc.xml
+/.idea/modules.xml
+/.idea/uniappSupport.xml
+/.idea/UniappTool.xml
+/.idea/vcs.xml
diff --git a/common/api/api.js b/common/api/api.js
index 25abaa5..661392c 100644
--- a/common/api/api.js
+++ b/common/api/api.js
@@ -31,6 +31,14 @@ export const APIuser = (data) => {
})
}
+export const updateUserInfoReq = (data) => {
+ return request({
+ url: url + '/user',
+ method: 'put',
+ data: data
+ })
+}
+
//获取手机号
export const APIuserphone = (data) => {
return request({
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 620d1d0..76d8c85 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,770 +1,735 @@
-
-
+
-
-
-
-
- {{ userInfo.nickName }}
-
-
-
-
-
-
-
-
-
-
- {{ unreadMsgCount > 99 ? '99+' : unreadMsgCount }}
+ " mode="aspectFill">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ unreadMsgCount > 99 ? '99+' : unreadMsgCount }}
+
+
+
-
-
-
-
-
+
-
-
-
- 我的资产
-
-
-
-
- 储值
-
-
- {{ rechargeTotal }}家店
-
-
-
+
+
+
+ 我的资产
+
+
+
+
+ 储值
+
+
+ {{ rechargeTotal }}家店
+
+
+
-
-
-
-
-
- ¥
- {{
+
+
+
+
+
+ ¥
+ {{
item.amount || "0.00"
}}
-
- {{
+
+ {{
item.shopName
}}
-
-
-
- 查看全部
-
-
-
-
-
-
-
- 会员
-
-
- {{ memberTotal }}家店
-
-
-
+
+
+
+ 查看全部
+
+
+
+
+
+
+
+
+ 会员
+
+
+ {{ memberTotal }}家店
+
+
+
-
-
-
-
- {{
+
+
+
+
+ {{
item.shopName
}}
-
-
-
- 查看全部
-
-
-
-
-
-
-
- 积分
-
-
- {{ coinTotal }}家店
-
-
-
+
+
+
+ 查看全部
+
+
+
+
+
+
+
+
+ 积分
+
+
+ {{ coinTotal }}家店
+
+
+
-
-
-
-
-
- ¥
- {{
+
+
+
+
+
+ ¥
+ {{
item.accountPoints || "0.00"
}}
-
- {{
+
+ {{
item.shopName
}}
-
-
-
- 查看全部
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
- {{
+
+
+
+ 查看全部
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{
userInfo.accountPoints || 0
}}
-
- 查看
-
-
-
-
-
+
+ 查看
+
+
+
+
+
-
-
-
- 扫码关注公众号
- 长按识别关注,更多优惠不能错过
-
-
-
-
+
+
+
+ 扫码关注公众号
+ 长按识别关注,更多优惠不能错过
+
+
+
+
-
- qrcodeResult(e)">
+
+ qrcodeResult(e)">
-
-
+
+
+ .msg-icon-wrapper {
+ position: relative;
+ margin-left: 30rpx;
+ }
+
+ .my-msg-icon {
+ width: 50rpx;
+ height: 50rpx;
+ }
+
+ // 角标样式
+ .badge {
+ position: absolute;
+ top: -8rpx;
+ right: -8rpx;
+ min-width: 32rpx;
+ height: 32rpx;
+ background-color: #ff3b30;
+ border-radius: 16rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 0 6rpx;
+ z-index: 10;
+
+ .badge-text {
+ color: white;
+ font-size: 20rpx;
+ font-weight: bold;
+ line-height: 1;
+ text-align: center;
+ }
+ }
+ }
+
\ No newline at end of file