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 @@
-
+
确认
diff --git a/src/subpackage/account/components/jurisdiction_item.vue b/src/subpackage/account/components/jurisdiction_item.vue
index 4f831bd..6fa65ce 100644
--- a/src/subpackage/account/components/jurisdiction_item.vue
+++ b/src/subpackage/account/components/jurisdiction_item.vue
@@ -1,7 +1,7 @@
账号&订阅
-
+
@@ -39,7 +39,6 @@ export default {
bottom: 0;
width: 30upx;
height: 30upx;
- background: skyblue;
}
&.centre{
@include ctf(center);
diff --git a/src/subpackage/account/components/permission_item.vue b/src/subpackage/account/components/permission_item.vue
index 184fab6..ce601ad 100644
--- a/src/subpackage/account/components/permission_item.vue
+++ b/src/subpackage/account/components/permission_item.vue
@@ -1,6 +1,6 @@
-
+
订单管理
@@ -23,7 +23,6 @@ export default {
margin-right: 14upx;
width: 26upx;
height: 26upx;
- background: skyblue;
}
.pi-txt{
@include flcw(28upx, 40upx, #9C9C9F, 500);
diff --git a/src/subpackage/account/components/select_container.vue b/src/subpackage/account/components/select_container.vue
index 5bcdbe0..0fce085 100644
--- a/src/subpackage/account/components/select_container.vue
+++ b/src/subpackage/account/components/select_container.vue
@@ -2,8 +2,9 @@
- 全选
-
+ 全选
+
+
@@ -22,6 +23,10 @@ export default {
title: {
type: String,
default: 'title'
+ },
+ isAll: {
+ type: Boolean,
+ default: false
}
}
}
@@ -34,12 +39,16 @@ export default {
flex-shrink: 0;
@include flcw(24upx, 34upx, #1A1A1A);
}
- .str-img{
+ .str-img, .str-icon{
margin-left: 18upx;
flex-shrink: 0;
width: 32upx;
height: 32upx;
- background: skyblue;
+
+ }
+ .str-icon{
+ border-radius: 50%;
+ border: 2upx solid #B2B2B2;
}
}
\ No newline at end of file
diff --git a/src/subpackage/account/components/user_info.vue b/src/subpackage/account/components/user_info.vue
index be3f83a..fdc5dce 100644
--- a/src/subpackage/account/components/user_info.vue
+++ b/src/subpackage/account/components/user_info.vue
@@ -3,9 +3,9 @@
周小舞
-
+
-
+
@@ -13,7 +13,7 @@
- 密码: 修改密码
+ 密码: 修改密码
创建时间: 2024-12-09 11:21:40
@@ -54,7 +54,6 @@ export default {
margin-left: 20upx;
width: 36upx;
height: 36upx;
- background: skyblue;
}
}
.it-delete{
@@ -62,7 +61,6 @@ export default {
margin-left: 20upx;
width: 36upx;
height: 36upx;
- background: skyblue;
}
}
.iu-box{
diff --git a/src/subpackage/account/pages/list/index.vue b/src/subpackage/account/pages/list/index.vue
index 96d25b6..c0f7783 100644
--- a/src/subpackage/account/pages/list/index.vue
+++ b/src/subpackage/account/pages/list/index.vue
@@ -2,10 +2,14 @@
-
+
@@ -14,6 +18,7 @@
import inputBar from './modules/input_bar.vue';
import checkStatusBar from './modules/check_status_bar.vue';
import listItem from './modules/item.vue';
+import { routeTo, showModal } from "@/utils/util.js";
export default {
components: {
'input-bar': inputBar,
@@ -22,14 +27,25 @@ export default {
},
data(){
return {
-
+ brand_id: '',
}
},
- onLoad(){
-
+ onLoad(options){
+ this.brand_id = options?.brand_id || '';
},
methods: {
-
+ messageSubscription(){
+ routeTo(`/subpackage/account/pages/message/info?brand_id=${this.brand_id}`, 'nT');
+ },
+ accountAuthority(){
+ routeTo(`/subpackage/account/pages/permission/info?brand_id=${this.brand_id}`, 'nT');
+ },
+ accountCheck(){
+ routeTo(`/subpackage/account/pages/manage/check?brand_id=${this.brand_id}`, 'nT');
+ },
+ itemDeleteBtn(){
+ showModal({ content: '是否删除该账号?', });
+ }
}
}
diff --git a/src/subpackage/account/pages/list/modules/check_status_bar.vue b/src/subpackage/account/pages/list/modules/check_status_bar.vue
index 327ef6c..5b3294e 100644
--- a/src/subpackage/account/pages/list/modules/check_status_bar.vue
+++ b/src/subpackage/account/pages/list/modules/check_status_bar.vue
@@ -1,5 +1,5 @@
-
+
待审核账号
99
diff --git a/src/subpackage/account/pages/list/modules/item.vue b/src/subpackage/account/pages/list/modules/item.vue
index 70f3d37..d211921 100644
--- a/src/subpackage/account/pages/list/modules/item.vue
+++ b/src/subpackage/account/pages/list/modules/item.vue
@@ -4,13 +4,14 @@
登录账号:P1531653
创建时间:2024-12-09 11:21:40
- 消息订阅
- 账号权限
+ 消息订阅
+ 账号权限
diff --git a/src/subpackage/account/pages/manage/methods.vue b/src/subpackage/account/pages/manage/methods.vue
index 761826d..b1afee8 100644
--- a/src/subpackage/account/pages/manage/methods.vue
+++ b/src/subpackage/account/pages/manage/methods.vue
@@ -4,19 +4,19 @@
-
+ 申请后,需管理员审核通过才可使用账号
欧轩智能商家助手
-
+ 申请后,需管理员审核通过才可使用账号
-
+ 添加账号后,凭账号密码可登录绑定商家助手
-
+
@@ -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 @@
已绑定(微信用户)
未绑定
- 解绑
+ 解绑
+ 去绑定
@@ -32,9 +33,9 @@
- 修改消息订阅
+ 修改消息订阅
-
+
@@ -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 @@
-
+
-
+
-
+
截图转发/点击放大图片后长按识别绑定账号,并关注“欧轩智能场馆”公众号接收消息
本人微信号绑定的可点击按钮去绑定
- 确认修改
+ 去绑定
@@ -22,14 +22,19 @@ export default {
},
data(){
return {
-
+ isShow: false
}
},
onLoad(){
},
methods: {
-
+ show(){
+ this.isShow = true;
+ },
+ hide(){
+ this.isShow = false;
+ }
}
}
diff --git a/src/subpackage/account/pages/permission/edit.vue b/src/subpackage/account/pages/permission/edit.vue
index f2ccafd..f878737 100644
--- a/src/subpackage/account/pages/permission/edit.vue
+++ b/src/subpackage/account/pages/permission/edit.vue
@@ -5,7 +5,7 @@
- 保存
+ 保存
@@ -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 @@
-
+
.jurisdiction-content{
- padding: 0 16upx;
+ padding: 0 14upx;
display: flex;
flex-wrap: wrap;
.mjc-item{
flex-shrink: 0;
flex-grow: 0;
width: 216upx;
- margin: 0 4upx;
- &:nth-child(n + 4){
- margin-top: 8upx;
- }
+ margin: 0 4upx 8upx;
}
}
diff --git a/src/subpackage/account/pages/permission/modules/edit/min_jurisdiction.vue b/src/subpackage/account/pages/permission/modules/edit/min_jurisdiction.vue
index 7521c57..83c9aaa 100644
--- a/src/subpackage/account/pages/permission/modules/edit/min_jurisdiction.vue
+++ b/src/subpackage/account/pages/permission/modules/edit/min_jurisdiction.vue
@@ -1,5 +1,5 @@
-
+
.jurisdiction-content{
- padding: 0 16upx;
+ padding: 0 14upx;
display: flex;
flex-wrap: wrap;
.mjc-item{
flex-shrink: 0;
flex-grow: 0;
width: 216upx;
- margin: 0 4upx;
- &:nth-child(n + 4){
- margin-top: 8upx;
- }
+ margin: 0upx 4upx 8upx;
}
}
diff --git a/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue b/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue
index 1d2fc0e..70ec0bf 100644
--- a/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue
+++ b/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue
@@ -1,5 +1,5 @@
-
+
.jurisdiction-content{
- padding: 0 16upx;
+ padding: 0 20upx;
.mjc-item + .mjc-item{
margin-top: 8upx;
}
diff --git a/src/subpackage/account/pages/permission/modules/info/edit_account.vue b/src/subpackage/account/pages/permission/modules/info/edit_account.vue
index ad012e1..113561b 100644
--- a/src/subpackage/account/pages/permission/modules/info/edit_account.vue
+++ b/src/subpackage/account/pages/permission/modules/info/edit_account.vue
@@ -1,5 +1,5 @@
-
+
登录账号:liuhuo2524
账号具有唯一性,不支持更改。
@@ -29,14 +29,19 @@ export default {
},
data(){
return {
-
+ isShow: false
}
},
onLoad(){
},
methods: {
-
+ show(){
+ this.isShow = true;
+ },
+ hide(){
+ this.isShow = false;
+ }
}
}
diff --git a/src/subpackage/account/pages/permission/modules/info/edit_password.vue b/src/subpackage/account/pages/permission/modules/info/edit_password.vue
index 730ee1e..a83fdee 100644
--- a/src/subpackage/account/pages/permission/modules/info/edit_password.vue
+++ b/src/subpackage/account/pages/permission/modules/info/edit_password.vue
@@ -1,5 +1,5 @@
-
+
*原密码
@@ -25,14 +25,19 @@ export default {
},
data(){
return {
-
+ isShow: false
}
},
onLoad(){
},
methods: {
-
+ show(){
+ this.isShow = true;
+ },
+ hide(){
+ this.isShow = false;
+ }
}
}
diff --git a/src/subpackage/account/pages/permission/modules/info/min_permission.vue b/src/subpackage/account/pages/permission/modules/info/min_permission.vue
index 61ea850..55283ab 100644
--- a/src/subpackage/account/pages/permission/modules/info/min_permission.vue
+++ b/src/subpackage/account/pages/permission/modules/info/min_permission.vue
@@ -4,7 +4,7 @@
已绑定(微信用户)
- 解绑
+ 解绑
diff --git a/src/subpackage/account/static/images/edit.png b/src/subpackage/account/static/images/edit.png
new file mode 100644
index 0000000..54842bc
Binary files /dev/null and b/src/subpackage/account/static/images/edit.png differ
diff --git a/src/subpackage/account/static/images/invite.png b/src/subpackage/account/static/images/invite.png
new file mode 100644
index 0000000..acb8df2
Binary files /dev/null and b/src/subpackage/account/static/images/invite.png differ
diff --git a/src/subpackage/account/static/images/scan.png b/src/subpackage/account/static/images/scan.png
new file mode 100644
index 0000000..f9314ab
Binary files /dev/null and b/src/subpackage/account/static/images/scan.png differ
diff --git a/src/subpackage/account/static/images/selected.png b/src/subpackage/account/static/images/selected.png
new file mode 100644
index 0000000..d8b4abf
Binary files /dev/null and b/src/subpackage/account/static/images/selected.png differ
diff --git a/src/subpackage/account/static/images/selected_corner.png b/src/subpackage/account/static/images/selected_corner.png
new file mode 100644
index 0000000..ed756e5
Binary files /dev/null and b/src/subpackage/account/static/images/selected_corner.png differ
diff --git a/src/subpackage/account/static/images/wx.png b/src/subpackage/account/static/images/wx.png
new file mode 100644
index 0000000..548a596
Binary files /dev/null and b/src/subpackage/account/static/images/wx.png differ