diff --git a/src/subpackage/account/components/fixed_button.vue b/src/subpackage/account/components/fixed_button.vue index 38073e9..ddee17a 100644 --- a/src/subpackage/account/components/fixed_button.vue +++ b/src/subpackage/account/components/fixed_button.vue @@ -1,7 +1,7 @@ @@ -25,7 +40,6 @@ export default { margin-right: 20upx; width: 52upx; height: 52upx; - background: skyblue; } .mb-content{ flex-grow: 1; @@ -44,7 +58,6 @@ export default { margin-left: 20upx; width: 28upx; height: 28upx; - background: skyblue; } } \ No newline at end of file diff --git a/src/subpackage/account/pages/message/edit.vue b/src/subpackage/account/pages/message/edit.vue index e66e2f1..2854a30 100644 --- a/src/subpackage/account/pages/message/edit.vue +++ b/src/subpackage/account/pages/message/edit.vue @@ -3,7 +3,7 @@ - 保存 + 保存 @@ -12,7 +12,7 @@ import user_info from "../../components/user_info.vue"; import fixedButton from "../../components/fixed_button.vue"; import subscribe_function from "./modules/edit/subscribe_function.vue" import subscribe_stadium from "./modules/edit/subscribe_stadium.vue" - +import { showModal } from "@/utils/util.js"; export default { components: { 'user-info': user_info, @@ -29,7 +29,9 @@ export default { }, methods: { - + saveBtn(){ + showModal({ content: '是否保存修改?', }); + } } } diff --git a/src/subpackage/account/pages/message/info.vue b/src/subpackage/account/pages/message/info.vue index 94a90f5..dced1f0 100644 --- a/src/subpackage/account/pages/message/info.vue +++ b/src/subpackage/account/pages/message/info.vue @@ -8,7 +8,8 @@ 已绑定(微信用户) 未绑定 - 解绑 + 解绑 + 去绑定 - 修改消息订阅 + 修改消息订阅 - + @@ -44,6 +45,7 @@ import user_info from "../../components/user_info.vue"; import fixedButton from "../../components/fixed_button.vue"; import permission_item from '../../components/permission_item.vue'; import bind_modal from "./modules/info/bind_modal.vue"; +import { routeTo } from "@/utils/util"; export default { components: { 'info-container': infoContainer, @@ -54,14 +56,21 @@ export default { }, data(){ return { - + isBind: false, + brand_id: '' } }, - onLoad(){ - + onLoad(options){ + this.brand_id = options?.brand_id || ''; }, methods: { - + bindBtn(){ + this.$refs?.bindModal?.show?.(); + }, + changeMessageSubscriptions(){ + routeTo(`/subpackage/account/pages/message/edit?brand_id=${this.brand_id}`, 'nT') + } + } } @@ -87,6 +96,9 @@ export default { flex-shrink: 0; margin-left: 10upx; @include flcw(24upx, 34upx, #EA5061); + &.bind-active{ + color: $mColor; + } } } .mi-content{ diff --git a/src/subpackage/account/pages/message/modules/edit/subscribe_function.vue b/src/subpackage/account/pages/message/modules/edit/subscribe_function.vue index 7b88621..8dd1fdf 100644 --- a/src/subpackage/account/pages/message/modules/edit/subscribe_function.vue +++ b/src/subpackage/account/pages/message/modules/edit/subscribe_function.vue @@ -1,5 +1,5 @@ @@ -16,6 +16,7 @@ import min_jurisdiction from "./modules/edit/min_jurisdiction.vue"; import cashier_jurisdiction from "./modules/edit/cashier_jurisdiction.vue"; import stadium_jurisdiction from "./modules/edit/stadium_jurisdiction.vue"; import fixedButton from "../../components/fixed_button.vue"; +import { showModal, debounce } from "@/utils/util.js"; export default { components: { 'user-info': user_info, @@ -34,7 +35,9 @@ export default { }, methods: { - + saveBtn: debounce(function(){ + showModal({ content: '是否保存该账号权限?', }); + }, 300, true) } } diff --git a/src/subpackage/account/pages/permission/info.vue b/src/subpackage/account/pages/permission/info.vue index a70c729..9bb99c6 100644 --- a/src/subpackage/account/pages/permission/info.vue +++ b/src/subpackage/account/pages/permission/info.vue @@ -1,13 +1,21 @@ @@ -20,7 +28,7 @@ import stadiumPermission from "./modules/info/stadium_permission.vue"; import fixedButton from "../../components/fixed_button.vue"; import editPassword from "./modules/info/edit_password.vue"; import edit_account from "./modules/info/edit_account.vue"; - +import { routeTo, showModal } from "@/utils/util.js"; export default { components: { 'admin-permission': adminPermission, @@ -34,14 +42,28 @@ export default { }, data(){ return { - + brand_id: '' } }, - onLoad(){ - + onLoad(options){ + this.brand_id = options?.brand_id || ''; }, methods: { - + userInfoEdit(){ + this.$refs?.editAccount?.show(); + }, + changePassword(){ + this.$refs?.editPassword?.show(); + }, + userDelete(){ + showModal({ content: '是否删除该账号?', }); + }, + editAuthority(){ + routeTo(`/subpackage/account/pages/permission/edit?brand_id=${this.brand_id}`, 'nT'); + }, + unbindWXAccount(){ + showModal({ content: '是否解绑该账号?', }); + } } } diff --git a/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue b/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue index a91a1fa..fa9b9bc 100644 --- a/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue +++ b/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue @@ -10,7 +10,7 @@ - + @@ -49,7 +49,7 @@ export default { flex-shrink: 0; width: 28upx; height: 28upx; - background: skyblue; + transform: rotate(90deg); } } } diff --git a/src/subpackage/account/pages/permission/modules/edit/cashier_jurisdiction.vue b/src/subpackage/account/pages/permission/modules/edit/cashier_jurisdiction.vue index 78b8ad9..f82a6bb 100644 --- a/src/subpackage/account/pages/permission/modules/edit/cashier_jurisdiction.vue +++ b/src/subpackage/account/pages/permission/modules/edit/cashier_jurisdiction.vue @@ -1,5 +1,5 @@