add logic for tid1509

src/subpackage/account/components/fixed_button.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="fixed-button">
         <view class="fb-box">
-            <view class="bottom-btn">
+            <view class="bottom-btn" @click="$emit('click')">
                 <slot>确认</slot>
             </view>
         </view>

src/subpackage/account/components/jurisdiction_item.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="jurisdiction-item" :class="{ active, centre }">
         <view class="ji-txt">账号&订阅</view>
-        <image class="ji-tag"></image>
+        <image class="ji-tag" mode="aspectFit" src="/subpackage/account/static/images/selected_corner.png" ></image>
     </view>
 </template>
 
@@ -39,7 +39,6 @@ export default {
             bottom: 0;
             width: 30upx;
             height: 30upx;
-            background: skyblue;
         }
         &.centre{
             @include ctf(center);

src/subpackage/account/components/permission_item.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="permission-item">
-        <image v-if="active" class="pi-icon"></image>
+        <image v-if="active" class="pi-icon"  mode="aspectFit" src="/subpackage/account/static/images/selected.png" ></image>
         <text class="pi-txt" :class="{ 'pi-active': active }">订单管理</text>
     </view>
 </template>
@@ -23,7 +23,6 @@ export default {
         margin-right: 14upx;
         width: 26upx;
         height: 26upx;
-        background: skyblue;
     }
     .pi-txt{
         @include flcw(28upx, 40upx, #9C9C9F, 500);

src/subpackage/account/components/select_container.vue

@@ -2,8 +2,9 @@
     <info-container :title="title">
         <template v-slot:title-right>
             <view class="sc-title-right">
-                <view class="str-txt">全选</view>
-                <image class="str-img"></image>
+                <view class="str-txt" @click="$emit('click:all')">全选</view>
+                <image class="str-img" @click="$emit('click:all')" v-if="isAll" mode="aspectFit" src="/subpackage/account/static/images/choose.png"></image>
+                <view class="str-icon" @click="$emit('click:all')" v-else></view>
             </view>
         </template>
         <template v-slot:content>
@@ -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;
         }
     }
 </style>

src/subpackage/account/components/user_info.vue

@@ -3,9 +3,9 @@
         <view class="iu-top">
             <view class="it-left">
                 <view class="il-name">周小舞</view>
-                <image class="il-edit" v-if="edit"></image>
+                <image @click="$emit('click:edit')" class="il-edit" v-if="edit" mode="aspectFit" src="/subpackage/account/static/images/edit.png"></image>
             </view>
-            <image class="it-delete" v-if="edit"></image>
+            <image @click="$emit('click:delete')" class="it-delete" v-if="edit" mode="aspectFit" src="/subpackage/account/static/images/delete.png"></image>
         </view>
         <view class="iu-box">
             <view class="iu-line">
@@ -13,7 +13,7 @@
             </view>
             <block v-if="edit">
                 <view class="iu-line">
-                    <text class="il-txt">密码：</text> <text class="il-link">修改密码</text>
+                    <text class="il-txt">密码：</text> <text class="il-link" @click="$emit('click:changePSW')">修改密码</text>
                 </view>
                 <view class="iu-line">
                     <text class="il-txt">创建时间：</text> 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{

src/subpackage/account/pages/list/index.vue

@@ -2,10 +2,14 @@
     <view class="list-index">
         <view class="li-header">
             <input-bar></input-bar>
-            <check-status-bar></check-status-bar>
+            <check-status-bar @click="accountCheck"></check-status-bar>
         </view>
         <view class="li-list">
-            <list-item></list-item>
+            <list-item
+                @click:message="messageSubscription"
+                @click:account="accountAuthority"
+                @click:delete="itemDeleteBtn"
+            ></list-item>
         </view>
     </view>
 </template>
@@ -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: '是否删除该账号？', });
+        }
     }
 }
 </script>

src/subpackage/account/pages/list/modules/check_status_bar.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="check-status-bar">
+    <view class="check-status-bar" @click="$emit('click')">
         <view class="csb-left">待审核账号</view>
         <view class="csb-right">
             <view class="cr-num">99</view>

src/subpackage/account/pages/list/modules/item.vue

@@ -4,13 +4,14 @@
         <view class="li-line">登录账号：P1531653</view>
         <view class="li-line">创建时间：2024-12-09 11:21:40</view>
         <view class="li-btns">
-            <view class="lb-btn">消息订阅</view>
-            <view class="lb-btn">账号权限</view>
+            <view class="lb-btn" @click="$emit('click:message')">消息订阅</view>
+            <view class="lb-btn" @click="$emit('click:account')">账号权限</view>
         </view>
         <image 
             class="li-close"
             mode="aspectFit"
             src="/subpackage/account/static/images/delete.png"
+             @click="$emit('click:delete')"
         ></image>
     </view>
 </template>

src/subpackage/account/pages/manage/methods.vue

@@ -4,17 +4,17 @@
             <stadium-info></stadium-info>
         </view>
         <view class="mm-box">
-            <method-bar></method-bar>
+            <method-bar icon="scan" title="扫描二维码申请加入" >申请后，需管理员审核通过才可使用账号</method-bar>
             <view class="mm-code">
                 <image class="mc-img"></image>
                 <view class="mc-txt">欧轩智能商家助手</view>
             </view>
         </view>
         <view class="mm-box">
-            <method-bar></method-bar>
+            <method-bar icon="wx" title="邀请微信朋友申请加入" isArrow>申请后，需管理员审核通过才可使用账号</method-bar>
         </view>
         <view class="mm-box">
-            <method-bar></method-bar>
+            <method-bar icon="invite" title="手动添加账号" isArrow>添加账号后，凭账号密码可登录绑定商家助手</method-bar>
         </view>
     </view> 
 </template>

src/subpackage/account/pages/manage/modules/check/pass_modal.vue

@@ -1,7 +1,7 @@
 <template>
     <fixed-modal close :show="isShow" @click:close="hide">
         <view class="pass-modal">
-            <view class="pm-list" v-if="num <= 3">
+            <!-- <view class="pm-list" v-if="num <= 3">
                 <view class="pl-item" v-for="i in num" :key="i">
                     <view class="pi-content">
                         <view class="pc-txt">姓名：刘星</view>
@@ -9,14 +9,15 @@
                     </view>
                     <view class="pi-btn">去配置权限</view>
                 </view>
-            </view>
-            <scroll-view class="pm-scroll-list" scroll-y v-else>
+            </view> -->
+            <!-- <scroll-view class="pm-scroll-list" scroll-y v-else> -->
+            <scroll-view class="pm-scroll-list" scroll-y>
                 <view class="pl-item" v-for="i in num" :key="i">
                     <view class="pi-content">
                         <view class="pc-txt">姓名：刘星</view>
                         <view class="pc-txt">登录账号：yaigigi</view>
                     </view>
-                    <view class="pi-btn">去配置权限</view>
+                    <view class="pi-btn" @click="toConfigPermission">去配置权限</view>
                 </view>
             </scroll-view>
         </view>
@@ -25,13 +26,14 @@
 
 <script>
 import fixedModal from "../../../../components/fixed_modal.vue";
+import { routeTo } from "@/utils/util";
 export default {
     components: {
         'fixed-modal': fixedModal,
     },
     data(){
         return {
-            num: 3,
+            num: 4,
             isShow: false
         }
     },
@@ -44,6 +46,9 @@ export default {
         },
         hide(){
             this.isShow = false
+        },
+        toConfigPermission(){
+            routeTo(`/subpackage/account/pages/permission/edit`, 'nT');
         }
     }
 }

src/subpackage/account/pages/manage/modules/methods/method_bar.vue

@@ -1,17 +1,32 @@
 <template>
     <view class="method-bar">
-        <image class="mb-icon"></image>
+        <image v-if="icon" class="mb-icon" mode="aspectFit" :src="'/subpackage/account/static/images/' + icon + '.png'"></image>
         <view class="mb-content">
-            <view class="mc-desc">邀请微信朋友申请加入</view>
-            <view class="mc-tip">申请后，需管理员审核通过才可使用账号</view>
+            <view class="mc-desc">{{ title }}</view>
+            <view class="mc-tip">
+                <slot></slot>
             </view>
-        <image class="mb-arrow"></image>
+        </view>
+        <image v-if="isArrow" class="mb-arrow" mode="aspectFit" src="/subpackage/account/static/images/arrow.png"></image>
     </view>
 </template>
 
 <script>
 export default {
-
+    props: {
+        icon: {
+            type: String,
+            default: ''
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        isArrow: {
+            type: Boolean,
+            default: false
+        }
+    }
 }
 </script>
 
@@ -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;
     }
 }
 </style>

src/subpackage/account/pages/message/edit.vue

@@ -3,7 +3,7 @@
         <user-info></user-info>
         <subscribe-function></subscribe-function>
         <subscribe-stadium></subscribe-stadium>
-        <fixed-button>保存</fixed-button>
+        <fixed-button @click="saveBtn">保存</fixed-button>
     </view>
 </template>
 
@@ -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: '是否保存修改？', });
+        }
     }
 }
 </script>

src/subpackage/account/pages/message/info.vue

@@ -8,7 +8,8 @@
                         <view class="tl-txt" v-if="false">已绑定（微信用户）</view>
                         <view class="tl-tag">未绑定</view>
                     </view>
-                    <view class="tr-status">解绑</view>
+                    <view class="tr-status" v-if="isBind">解绑</view>
+                    <view class="tr-status bind-active" v-else @click="bindBtn">去绑定</view>
                 </view>
             </template>
             <template v-slot:content>
@@ -32,9 +33,9 @@
                 </view>
             </template>
         </info-container>
-        <fixed-button>修改消息订阅</fixed-button>
+        <fixed-button @click="changeMessageSubscriptions">修改消息订阅</fixed-button>
 
-        <bind-modal></bind-modal>
+        <bind-modal ref="bindModal"></bind-modal>
     </view>
 </template>
 
@@ -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,13 +56,20 @@ 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{

src/subpackage/account/pages/message/modules/edit/subscribe_function.vue

@@ -1,5 +1,5 @@
 <template>
-    <select-container  title="订阅模块">
+    <select-container  title="订阅模块" :is-all="isAll" @click:all="isAll = !isAll">
         <view class="jurisdiction-content">
             <view class="mjc-item" v-for="i in 3" :key="i">
                 <jurisdiction-item 
@@ -22,7 +22,7 @@ export default {
     },
     data(){
         return {
-            
+            isAll: false
         }
     },
     onLoad(){

src/subpackage/account/pages/message/modules/edit/subscribe_stadium.vue

@@ -1,5 +1,5 @@
 <template>
-    <select-container  title="订阅门店">
+    <select-container  title="订阅门店" :is-all="isAll" @click:all="isAll = !isAll">
         <view class="jurisdiction-content">
             <view class="mjc-item" v-for="i in 3" :key="i">
                 <jurisdiction-item 
@@ -21,7 +21,7 @@ export default {
     },
     data(){
         return {
-            
+            isAll: false
         }
     },
     onLoad(){

src/subpackage/account/pages/message/modules/info/bind_modal.vue

@@ -1,11 +1,11 @@
 <template>
-    <fixed-modal title="绑定">
+    <fixed-modal title="绑定" :show="isShow" close @click:close="hide">
         <view class="bind-modal">
             <image class="bm-code-img"></image>
             <view class="bm-tip">截图转发/点击放大图片后长按识别绑定账号，并关注“欧轩智能场馆”公众号接收消息</view>
             <view class="bm-btn-frame">
                 <view class="bbf-tip">本人微信号绑定的可点击按钮去绑定</view>
-                <modal-button green>确认修改</modal-button>
+                <modal-button green>去绑定</modal-button>
             </view>
         </view>
     </fixed-modal>
@@ -22,14 +22,19 @@ export default {
     },
     data(){
         return {
-            
+            isShow: false
         }
     },
     onLoad(){
         
     },
     methods: {
-        
+        show(){
+            this.isShow = true;
+        },
+        hide(){
+            this.isShow = false;
+        }
     }
 }
 </script>

src/subpackage/account/pages/permission/edit.vue

@@ -5,7 +5,7 @@
         <min-jurisdiction></min-jurisdiction>
         <cashier-jurisdiction></cashier-jurisdiction>
         <stadium-jurisdiction></stadium-jurisdiction>
-        <fixed-button>保存</fixed-button>
+        <fixed-button @click="saveBtn">保存</fixed-button>
     </view>
 </template>
 
@@ -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)
     }
 }
 </script>

src/subpackage/account/pages/permission/info.vue

@@ -1,13 +1,21 @@
 <template>
     <view class="permission-info">
-        <user-info edit></user-info>
+        <user-info 
+            edit
+            @click:edit="userInfoEdit"
+            @click:delete="userDelete"
+            @click:changePSW="changePassword"
+        ></user-info>
         <admin-permission></admin-permission>
-        <min-permission></min-permission>
+        <min-permission
+            @click:unbind="unbindWXAccount"
+        ></min-permission>
         <cashier-permission></cashier-permission>
         <stadium-permission></stadium-permission>
-        <fixed-button>修改权限</fixed-button>
-        <!-- <edit-password></edit-password> -->
-        <!-- <edit-account></edit-account> -->
+        <fixed-button @click="editAuthority">修改权限</fixed-button>
+
+        <edit-password ref="editPassword"></edit-password>
+        <edit-account ref="editAccount"></edit-account>
     </view>
 </template>
 
@@ -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: '是否解绑该账号？', });
+        }
     }
 }
 </script>

src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue

@@ -10,7 +10,7 @@
                 <picker>
                     <view class="ac-frame">
                         <input class="af-ipt" disabled type="text" />
-                        <image class="af-icon"></image>
+                        <image class="af-icon" mode="aspectFit" src="/subpackage/account/static/images/arrow.png"></image>
                     </view>
                 </picker>
             </view>
@@ -49,7 +49,7 @@ export default {
                 flex-shrink: 0;
                 width: 28upx;
                 height: 28upx;
-                background: skyblue;
+                transform: rotate(90deg);
             }
         }
     }

src/subpackage/account/pages/permission/modules/edit/cashier_jurisdiction.vue

@@ -1,5 +1,5 @@
 <template>
-    <select-container  title="收银系统权限">
+    <select-container  title="收银系统权限" :is-all="isAll" @click:all="isAll = !isAll">
         <view class="jurisdiction-content">
             <view class="mjc-item" v-for="i in 3" :key="i">
                 <jurisdiction-item 
@@ -22,7 +22,7 @@ export default {
     },
     data(){
         return {
-            
+            isAll: false
         }
     },
     onLoad(){
@@ -36,17 +36,14 @@ export default {
 
 <style lang="scss"> 
     .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;
         }
     }
     

src/subpackage/account/pages/permission/modules/edit/min_jurisdiction.vue

@@ -1,5 +1,5 @@
 <template>
-    <select-container  title="商家助手小程序权限">
+    <select-container  title="商家助手小程序权限" :is-all="isAll" @click:all="isAll = !isAll">
         <view class="jurisdiction-content">
             <view class="mjc-item" v-for="i in 5" :key="i">
                 <jurisdiction-item 
@@ -22,7 +22,7 @@ export default {
     },
     data(){
         return {
-            
+            isAll: false
         }
     },
     onLoad(){
@@ -36,17 +36,14 @@ export default {
 
 <style lang="scss"> 
     .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;
         }
     }
     

src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue

@@ -1,5 +1,5 @@
 <template>
-    <select-container  title="门店权限">
+    <select-container  title="门店权限" :is-all="isAll" @click:all="isAll = !isAll">
         <view class="jurisdiction-content">
             <view class="mjc-item" v-for="i in 4" :key="i">
                 <jurisdiction-item 
@@ -21,7 +21,7 @@ export default {
     },
     data(){
         return {
-            
+            isAll: false
         }
     },
     onLoad(){
@@ -35,7 +35,7 @@ export default {
 
 <style lang="scss"> 
     .jurisdiction-content{
-        padding: 0 16upx;
+        padding: 0 20upx;
         .mjc-item + .mjc-item{
             margin-top: 8upx;
         }

src/subpackage/account/pages/permission/modules/info/edit_account.vue

@@ -1,5 +1,5 @@
 <template>
-    <fixed-modal title="修改账号信息">
+    <fixed-modal title="修改账号信息" :show="isShow" close @click:close="hide">
         <view class="edit-account">
             <view class="ea-num">登录账号：liuhuo2524</view>
             <view class="ea-tip">账号具有唯一性，不支持更改。</view>
@@ -29,14 +29,19 @@ export default {
     },
     data(){
         return {
-            
+            isShow: false
         }
     },
     onLoad(){
         
     },
     methods: {
-        
+        show(){
+            this.isShow = true;
+        },
+        hide(){
+            this.isShow = false;
+        }
     }
 }
 </script>

src/subpackage/account/pages/permission/modules/info/edit_password.vue

@@ -1,5 +1,5 @@
 <template>
-    <fixed-modal title="修改密码">
+    <fixed-modal title="修改密码" :show="isShow" close @click:close="hide">
         <view class="edit-password">
             <view class="ep-item">
                 <view class="ei-label"><text class="el-star">*</text>原密码</view>
@@ -25,14 +25,19 @@ export default {
     },
     data(){
         return {
-            
+            isShow: false
         }
     },
     onLoad(){
         
     },
     methods: {
-        
+        show(){
+            this.isShow = true;
+        },
+        hide(){
+            this.isShow = false;
+        }
     }
 }
 </script>

src/subpackage/account/pages/permission/modules/info/min_permission.vue

@@ -4,7 +4,7 @@
             <template v-slot:title-right>
                 <view class="mp-tr-content">
                     <view class="mtc-name">已绑定（微信用户）</view>
-                    <view class="mtc-status">解绑</view>
+                    <view class="mtc-status" @click="$emit('click:unbind')">解绑</view>
                 </view>
             </template>
             <template v-slot:content>