diff --git a/app/pages/address/list/index.json b/app/pages/address/list/index.json index f17be8fb5..8ea385189 100644 --- a/app/pages/address/list/index.json +++ b/app/pages/address/list/index.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "地址列表", "usingComponents": { "l-icon": "../../../miniprogram_npm/lin-ui/icon/index", - "l-button": "../../../miniprogram_npm/lin-ui/button/index" + "l-button": "../../../miniprogram_npm/lin-ui/button/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/address/list/index.wxml b/app/pages/address/list/index.wxml index 9cbe1c801..10193e710 100644 --- a/app/pages/address/list/index.wxml +++ b/app/pages/address/list/index.wxml @@ -13,7 +13,5 @@ - - 新建 - + \ No newline at end of file diff --git a/app/pages/address/upsert/index.json b/app/pages/address/upsert/index.json index c70a6ac7f..8ac3ca1c2 100644 --- a/app/pages/address/upsert/index.json +++ b/app/pages/address/upsert/index.json @@ -6,6 +6,8 @@ "l-label": "../../../miniprogram_npm/lin-ui/label/index", "l-textarea": "../../../miniprogram_npm/lin-ui/textarea/index", "l-list": "../../../miniprogram_npm/lin-ui/list/index", - "l-button": "../../../miniprogram_npm/lin-ui/button/index" + "l-button": "../../../miniprogram_npm/lin-ui/button/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button", + "t-button-group": "../../../miniprogram_npm/tdesign/button-group/button-group" } } \ No newline at end of file diff --git a/app/pages/address/upsert/index.wxml b/app/pages/address/upsert/index.wxml index a6e686df9..78c257521 100644 --- a/app/pages/address/upsert/index.wxml +++ b/app/pages/address/upsert/index.wxml @@ -6,10 +6,8 @@ - - - 确定 - - 重置 - + + + + \ No newline at end of file diff --git a/app/pages/mobile/login/index.json b/app/pages/mobile/login/index.json index ec4443bcb..e4fba4095 100644 --- a/app/pages/mobile/login/index.json +++ b/app/pages/mobile/login/index.json @@ -1,6 +1,7 @@ { "navigationBarTitleText": "手机号登录", "usingComponents": { - "l-button": "../../../miniprogram_npm/lin-ui/button/index" + "l-button": "../../../miniprogram_npm/lin-ui/button/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/mobile/login/index.wxml b/app/pages/mobile/login/index.wxml index a6c3e6532..a4f82c362 100644 --- a/app/pages/mobile/login/index.wxml +++ b/app/pages/mobile/login/index.wxml @@ -9,9 +9,5 @@ 尚未授权手机号 - - - 授权手机号 - - + \ No newline at end of file diff --git a/app/pages/mobile/me/index.json b/app/pages/mobile/me/index.json index 7edef35da..c6d43e1d2 100644 --- a/app/pages/mobile/me/index.json +++ b/app/pages/mobile/me/index.json @@ -1,6 +1,7 @@ { "navigationBarTitleText": "手机号", "usingComponents": { - "l-button": "../../../miniprogram_npm/lin-ui/button/index" + "l-button": "../../../miniprogram_npm/lin-ui/button/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/mobile/me/index.wxml b/app/pages/mobile/me/index.wxml index a6c3e6532..a4f82c362 100644 --- a/app/pages/mobile/me/index.wxml +++ b/app/pages/mobile/me/index.wxml @@ -9,9 +9,5 @@ 尚未授权手机号 - - - 授权手机号 - - + \ No newline at end of file diff --git a/app/pages/token/me/index.json b/app/pages/token/me/index.json index 35faa2604..c9adb5b5a 100644 --- a/app/pages/token/me/index.json +++ b/app/pages/token/me/index.json @@ -4,6 +4,7 @@ "component-menu": "@project/components/token/menu/index", "l-list": "../../../miniprogram_npm/lin-ui/list/index", "l-icon": "../../../miniprogram_npm/lin-ui/icon/index", - "l-button": "../../../miniprogram_npm/lin-ui/button/index" + "l-button": "../../../miniprogram_npm/lin-ui/button/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/token/me/index.wxml b/app/pages/token/me/index.wxml index 0274ff3da..34243bd8c 100644 --- a/app/pages/token/me/index.wxml +++ b/app/pages/token/me/index.wxml @@ -9,10 +9,10 @@ {{ nickname || '未设置'}} - 更新 + - 登录 + diff --git a/app/pages/user/manage/detail/index.json b/app/pages/user/manage/detail/index.json index 0194b5079..2edb872ca 100644 --- a/app/pages/user/manage/detail/index.json +++ b/app/pages/user/manage/detail/index.json @@ -5,6 +5,7 @@ "l-tag": "../../../../miniprogram_npm/lin-ui/tag/index", "l-button": "../../../../miniprogram_npm/lin-ui/button/index", "l-icon": "../../../../miniprogram_npm/lin-ui/icon/index", - "l-list": "../../../../miniprogram_npm/lin-ui/list/index" + "l-list": "../../../../miniprogram_npm/lin-ui/list/index", + "t-button": "../../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/user/manage/detail/index.wxml b/app/pages/user/manage/detail/index.wxml index 645c75162..f481eb293 100644 --- a/app/pages/user/manage/detail/index.wxml +++ b/app/pages/user/manage/detail/index.wxml @@ -42,8 +42,6 @@ - - 更多 - + \ No newline at end of file diff --git a/app/pages/user/manage/index.json b/app/pages/user/manage/index.json index 77d2ecb57..0d317c536 100644 --- a/app/pages/user/manage/index.json +++ b/app/pages/user/manage/index.json @@ -3,6 +3,7 @@ "usingComponents": { "l-icon": "../../../miniprogram_npm/lin-ui/icon/index", "l-button": "../../../miniprogram_npm/lin-ui/button/index", - "l-tag": "../../../miniprogram_npm/lin-ui/tag/index" + "l-tag": "../../../miniprogram_npm/lin-ui/tag/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/user/manage/index.wxml b/app/pages/user/manage/index.wxml index 7ac767e32..3e5205871 100644 --- a/app/pages/user/manage/index.wxml +++ b/app/pages/user/manage/index.wxml @@ -29,7 +29,5 @@ - - 新建 - + \ No newline at end of file diff --git a/app/pages/user/manage/upsert/index.json b/app/pages/user/manage/upsert/index.json index 04714f724..8474be727 100644 --- a/app/pages/user/manage/upsert/index.json +++ b/app/pages/user/manage/upsert/index.json @@ -4,6 +4,7 @@ "l-list": "../../../../miniprogram_npm/lin-ui/list/index", "l-input": "../../../../miniprogram_npm/lin-ui/input/index", "l-button": "../../../../miniprogram_npm/lin-ui/button/index", - "l-picker": "../../../../miniprogram_npm/lin-ui/picker/index" + "l-picker": "../../../../miniprogram_npm/lin-ui/picker/index", + "t-button": "../../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/user/manage/upsert/index.wxml b/app/pages/user/manage/upsert/index.wxml index e7adb1a64..f1b4e51c6 100644 --- a/app/pages/user/manage/upsert/index.wxml +++ b/app/pages/user/manage/upsert/index.wxml @@ -9,9 +9,5 @@ - - - 确定 - - + \ No newline at end of file diff --git a/app/pages/userEntityGrant/confirm/index.json b/app/pages/userEntityGrant/confirm/index.json index 15f102c01..c6924c932 100644 --- a/app/pages/userEntityGrant/confirm/index.json +++ b/app/pages/userEntityGrant/confirm/index.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "获取权限", "usingComponents": { "l-button": "../../../miniprogram_npm/lin-ui/button/index", - "l-icon": "../../../miniprogram_npm/lin-ui/icon/index" + "l-icon": "../../../miniprogram_npm/lin-ui/icon/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/userEntityGrant/confirm/index.wxml b/app/pages/userEntityGrant/confirm/index.wxml index 7262765a6..f5ad5a1b6 100644 --- a/app/pages/userEntityGrant/confirm/index.wxml +++ b/app/pages/userEntityGrant/confirm/index.wxml @@ -7,7 +7,5 @@ {{relation || '无数据'}} - - 确定 - + \ No newline at end of file diff --git a/app/pages/userEntityGrant/grant/index.json b/app/pages/userEntityGrant/grant/index.json index 58e0f6da3..ac94cc00b 100644 --- a/app/pages/userEntityGrant/grant/index.json +++ b/app/pages/userEntityGrant/grant/index.json @@ -1,6 +1,6 @@ { "navigationBarTitleText": "授予权限", "usingComponents": { - "l-button": "../../../miniprogram_npm/lin-ui/button/index" + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/userEntityGrant/grant/index.wxml b/app/pages/userEntityGrant/grant/index.wxml index 048cbaaa5..1913fdecc 100644 --- a/app/pages/userEntityGrant/grant/index.wxml +++ b/app/pages/userEntityGrant/grant/index.wxml @@ -10,9 +10,5 @@ - - - {{t('common:action.confirm')}} - - + \ No newline at end of file diff --git a/app/pages/userRelation/detail/index.json b/app/pages/userRelation/detail/index.json index 80ca480c5..00adadf82 100644 --- a/app/pages/userRelation/detail/index.json +++ b/app/pages/userRelation/detail/index.json @@ -4,6 +4,7 @@ "l-button": "../../../miniprogram_npm/lin-ui/button/index", "l-tag": "../../../miniprogram_npm/lin-ui/tag/index", "l-checkbox": "../../../miniprogram_npm/lin-ui/checkbox/index", - "l-icon": "../../../miniprogram_npm/lin-ui/icon/index" + "l-icon": "../../../miniprogram_npm/lin-ui/icon/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/userRelation/onEntity/index.json b/app/pages/userRelation/onEntity/index.json index 4503e9740..602ff1000 100644 --- a/app/pages/userRelation/onEntity/index.json +++ b/app/pages/userRelation/onEntity/index.json @@ -9,6 +9,7 @@ "l-checkbox": "../../../miniprogram_npm/lin-ui/checkbox/index", "l-switch": "../../../miniprogram_npm/lin-ui/switch/index", "divider": "../../../components/UI/divider/index", - "fab": "../../../components/UI/fab/index" + "fab": "../../../components/UI/fab/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button" } } \ No newline at end of file diff --git a/app/pages/userRelation/onEntity/index.wxml b/app/pages/userRelation/onEntity/index.wxml index f570c2e74..07ce50889 100644 --- a/app/pages/userRelation/onEntity/index.wxml +++ b/app/pages/userRelation/onEntity/index.wxml @@ -28,9 +28,5 @@ - - - 确定 - - + \ No newline at end of file diff --git a/app/pages/userRelation/onUser/index.json b/app/pages/userRelation/onUser/index.json index 1a3b00d6c..7928ea47b 100644 --- a/app/pages/userRelation/onUser/index.json +++ b/app/pages/userRelation/onUser/index.json @@ -9,6 +9,8 @@ "l-search-bar": "../../../miniprogram_npm/lin-ui/search-bar/index", "l-switch": "../../../miniprogram_npm/lin-ui/switch/index", "divider": "../../../components/UI/divider/index", - "fab": "../../../components/UI/fab/index" + "fab": "../../../components/UI/fab/index", + "t-button": "../../../miniprogram_npm/tdesign/button/button", + "t-button-group": "../../../miniprogram_npm/tdesign/button-group/button-group" } } \ No newline at end of file diff --git a/app/pages/userRelation/onUser/index.wxml b/app/pages/userRelation/onUser/index.wxml index c923e2b22..313d5b1a6 100644 --- a/app/pages/userRelation/onUser/index.wxml +++ b/app/pages/userRelation/onUser/index.wxml @@ -32,6 +32,10 @@ 确定 +