Explorar o código

fix:
1. 2070:修改设置页面和我的页面中的默认头像文件保持一致
2. 2069:修改登录页面隐私协议的文案
3. 修改注销账号弹窗的按钮样式

YuJing hai 2 meses
pai
achega
8982bfc38e

+ 3 - 1
commons/basic/src/main/ets/apis/YTUserRequest.ets

@@ -34,7 +34,9 @@ export class YTUserRequest extends YTRequest {
         .then(res => {
           userInfo.setToken(res[AppStorageKeyCollect.TOKEN])
           YTUserRequest.refreshUserInfo((res) => {
-            IBestToast.show({ message: '登录成功' })
+            setTimeout(() => {
+              IBestToast.show({ message: '登录成功' })
+            }, 500)
             yTRouter.routerBack()
             result?.(res)
           })

+ 5 - 0
commons/basic/src/main/ets/components/generalComp/YtDoubleConfirm.ets

@@ -20,6 +20,11 @@ export function yTDoubleConfirm(item: BasicType<undefined>) {
           btWidth: 108,
           btHeight: 37,
           btFontSize: 12,
+          btlinear: {
+            colors: [ ['#B9FD2A', 0.01], ['#F5FD6D', 1] ],
+            angle: 110
+          },
+          btFontColor: Color.Black,
           click: item.click
         }
       )

+ 1 - 2
features/user/src/main/ets/components/Terms.ets

@@ -33,10 +33,9 @@ export struct Terms {
           //   })
           //
           // Span('以及')
-          Span('《小易决定用户协议》')
+          Span('《朝暮日记用户协议》')
             .spanEx(() => {
               yTRouter.router2userAgreement()
-
             })
           Span('和')
           Span('《隐私政策》')

+ 5 - 3
features/user/src/main/ets/pages/SettingPage.ets

@@ -112,11 +112,13 @@ struct SettingPage {
           bgc: Color.White,
           click: () => {
             yTToast.doubleConfirm({
-              text: '警告⚠', message: '确定要注销吗?\n注销后数据可能丢失无法恢复!', click: () => {
+              text: '警告⚠', message: '确定要注销吗?\n注销后数据可能丢失无法恢复!',
+              click: () => {
                 userInfo.logout()
                 yTToast.hide()
                 yTRouter.routerBack()
-              }
+                YTUserRequest.logout()
+              },
             })
           }
         })
@@ -159,7 +161,7 @@ struct SettingPage {
         .fontColor('#80000000')
       Row() {
         if (item.src === 'head') {
-          Image(this.userInfo.getHeadImg() ? this.userInfo.getHeadImg() : $r('app.media.default_img'))
+          Image(this.userInfo.getHeadImg() ? this.userInfo.getHeadImg() : $r('app.media.app_icon'))
             .height(24)
             .width(24)
             .borderRadius(12)