'0048'

src/views/merchant/components/agent.vue

@@ -0,0 +1,281 @@
+<!--
+ * @Descripttion: 用户选择器
+ * @version: 1.0
+ * @Author: Zory
+ * @Date: 2024年1月10日21:46:29
+-->
+<template>
+    <el-dialog :title="titleMap[mode]" v-model="visible" :width="800" destroy-on-close @closed="$emit('closed')">
+        <div class="main">
+            <div class="main-left">
+                <div class="main-top">
+                    <el-form class="lv-form-inline" ref="searchForm" :model="searchKey" label-position="right">
+                        <el-row :gutter="10">
+                            <el-col :span="18" :xs="12">
+                                <el-form-item label=" " prop="truename">
+                                    <el-input v-model="searchKey.truename" placeholder="请输入门店名称" clearable
+                                        :style="{width: '100%'}"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6" :xs="12">
+                                <el-form-item>
+                                    <div class="search-btn">
+                                        <el-button type="primary" @click="searchForm">搜索</el-button>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </div>
+                <div class="main-body-wrap" v-if="!multiple">
+                    <scTable ref="table" :apiObj="list.apiObj" :hideSetting="true" paginationLayout="total, prev, pager, next" :params="searchKey" @current-change="handleCurrentChange" highlight-current-row :row-key="getRowKeys" @sortChange="sortChange">
+                        <el-table-column width="50" fixed="left">
+                            <div class="checkbox"></div>
+                        </el-table-column>
+                        <el-table-column label="代理名称" width="150" fixed="left" prop="truename"></el-table-column>
+                        <el-table-column label="代理ID" width="150" prop="user_id"></el-table-column>
+                        <el-table-column label="登录账号" prop="truename" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.username">{{ scope.row.username }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="手机号码" prop="mobile" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.mobile">{{ scope.row.mobile }}</span>
+                                <span class="status-danger" v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="到期时间" prop="vip_end" width="220"></el-table-column>
+                        <el-table-column label="最后登录" prop="advertiser_name">
+                            <el-table-column label="登录时间" prop="login_at" width="180">
+                                <template #default="scope">
+                                    {{scope.row.login_at?scope.row.login_at:'-'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="登录IP" prop="login_ip" width="180">
+                                <template #default="scope">
+                                    {{scope.row.login_ip?scope.row.login_ip:'-'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="登录次数" prop="login_num" width="180"></el-table-column>
+                        </el-table-column>
+                        <el-table-column label="注册信息" prop="advertiser_name">
+                            <el-table-column label="注册时间" prop="create_at" width="180"></el-table-column>
+                            <el-table-column label="注册IP" prop="create_ip" width="180"></el-table-column>
+                        </el-table-column>
+                        <el-table-column label="状态" prop="status" width="120" align="center">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.status==1"><sc-status-indicator type="success"></sc-status-indicator> 正常</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 禁用</div>
+                            </template>
+                        </el-table-column>
+                    </scTable>
+                </div>
+                <div class="main-body-wrap" v-else>
+                    <scTable ref="table" :apiObj="list.apiObj" :hideSetting="true" paginationLayout="total, prev, pager, next" :params="searchKey" @selectionChange="selectionChange" row-key="id" @sortChange="sortChange">
+                        <el-table-column type="selection" width="50" fixed="left"></el-table-column>
+                        <el-table-column label="代理名称" width="150" fixed="left" prop="truename"></el-table-column>
+                        <el-table-column label="代理ID" width="150" prop="user_id"></el-table-column>
+                        <el-table-column label="登录账号" prop="truename" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.username">{{ scope.row.username }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="手机号码" prop="mobile" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.mobile">{{ scope.row.mobile }}</span>
+                                <span class="status-danger" v-else>-</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="到期时间" prop="vip_end" width="220"></el-table-column>
+                        <el-table-column label="最后登录" prop="advertiser_name">
+                            <el-table-column label="登录时间" prop="login_at" width="180">
+                                <template #default="scope">
+                                    {{scope.row.login_at?scope.row.login_at:'-'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="登录IP" prop="login_ip" width="180">
+                                <template #default="scope">
+                                    {{scope.row.login_ip?scope.row.login_ip:'-'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="登录次数" prop="login_num" width="180"></el-table-column>
+                        </el-table-column>
+                        <el-table-column label="注册信息" prop="advertiser_name">
+                            <el-table-column label="注册时间" prop="create_at" width="180"></el-table-column>
+                            <el-table-column label="注册IP" prop="create_ip" width="180"></el-table-column>
+                        </el-table-column>
+                        <el-table-column label="状态" prop="status" width="120" align="center">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.status==1"><sc-status-indicator type="success"></sc-status-indicator> 正常</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 禁用</div>
+                            </template>
+                        </el-table-column>
+                    </scTable>
+                </div>
+            </div>
+        </div>
+		<template #footer>
+			<el-button @click="visible=false" >取 消</el-button>
+			<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">确 定</el-button>
+		</template>
+    </el-dialog>
+</template>
+
+<script>
+export default{
+    emits: ['success', 'closed'],
+    props: {
+        multiple: { type: Boolean, default: false },
+    },
+    data(){
+        return {
+            loading: false,
+            mode:"add",
+            titleMap:{
+                add:"选择代理",
+                edit:"选择代理"
+            },
+            list: {
+                apiObj: this.$API.user.list
+            },
+            visible: false,
+            isSaveing: false,
+            formData:{},
+            searchKey:{"type":2},
+            selectData:[]
+        }
+    },
+    methods:{
+        sortChange(event){
+            if (event.order) {
+                var data = {
+                    "field":event.prop,
+                    "order":event.order
+                }
+                this.$refs.table.upData(data)
+            } else {
+                this.$refs.table.reload(this.searchKey)
+            }
+            return ;
+        },
+        submit(){
+            if (this.selectData.length == 0)
+            {
+                return this.$message.error("请选择数据");
+            }
+            this.isSaveing = false;
+            this.visible = false;
+            if (this.multiple){
+                this.$emit('success', this.selectData);
+            } else {
+                this.$emit('success', this.selectData[0]);
+            }
+        },
+        getRowKeys(data){
+            return data.id;
+        },
+        clearAll(){
+            this.selectData = [];
+        },
+        removeUser(index,name){
+            this.selectData.splice(index, 1);
+            console.log(name)
+        },
+        handleCurrentChange(data){
+            this.selectData = [data];
+        },
+        selectionChange(data){
+            this.selectData = data;
+        },
+        searchForm(){
+            this.$refs.table.upData(this.searchKey)
+        },
+        fristName(name){
+            return name.substring(0,1);
+        },
+        open(mode = 'add'){
+            this.mode = mode;
+            this.visible = true;
+            return this
+        },
+        //表单注入数据
+        setData(data){
+            this.formData = data;
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.main{
+    display: flex;
+    border: 1px solid #dfe1e6;
+}
+.main-left{
+    overflow: hidden;
+    flex: 1;
+    .main-body-wrap{
+        position: relative;
+        height: 380px;
+    }
+}
+.main-top{
+    position: relative;
+    padding: 10px 0;
+    border-bottom: 1px solid #dfe1e6;
+    &.is-right{
+        height:53px;
+        display:flex;
+        align-items:center;
+        padding:0 10px;
+        justify-content:space-between;
+    }
+}
+.main-body.is-right{
+    padding: 8px 16px;
+    overflow-y: auto;
+    position: relative;
+    height: calc(100% - 53px);
+    max-height: 380px;
+}
+.mx-1{
+    margin: 0 0.5rem 0.5rem 0;
+}
+.main-right{
+    flex: 0.4;
+}
+.el-form-item--default{
+    margin-bottom: 0;
+}
+.checkbox{
+    border:1px solid #dfe1e6;
+    width: 14px;
+    height: 14px;
+    border-radius: 2px;
+    background-color: #fff;
+    cursor: pointer;
+    position:relative
+}
+.current-row .checkbox{
+    background-color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+}
+.current-row .checkbox:after{
+    transform: rotate(45deg) scaleY(1);
+    box-sizing: content-box;
+    content: "";
+    border: 1px solid #fff;
+    border-left: 0;
+    border-top: 0;
+    height: 7px;
+    left: 4px;
+    position: absolute;
+    top: 1px;
+    width: 3px;
+    transition: transform .15s ease-in 50ms;
+    transform-origin: center;
+}
+</style>

src/views/merchant/components/store.vue

@@ -0,0 +1,289 @@
+<!--
+ * @Descripttion: 用户选择器
+ * @version: 1.0
+ * @Author: Zory
+ * @Date: 2024年1月10日21:46:29
+-->
+<template>
+    <el-dialog :title="titleMap[mode]" v-model="visible" :width="800" destroy-on-close @closed="$emit('closed')">
+        <div class="main">
+            <div class="main-left">
+                <div class="main-top">
+                    <el-form class="lv-form-inline" ref="searchForm" :model="searchKey" label-position="right">
+                        <el-row :gutter="10">
+                            <el-col :span="18" :xs="12">
+                                <el-form-item label=" " prop="name">
+                                    <el-input v-model="searchKey.name" placeholder="请输入店铺名称" clearable
+                                        :style="{width: '100%'}"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6" :xs="12">
+                                <el-form-item>
+                                    <div class="search-btn">
+                                        <el-button type="primary" @click="searchForm">搜索</el-button>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </div>
+                <div class="main-body-wrap" v-if="!multiple">
+                    <scTable ref="table" :apiObj="list.apiObj" :hideSetting="true" paginationLayout="total, prev, pager, next" :params="searchKey" @current-change="handleCurrentChange" highlight-current-row :row-key="getRowKeys" @sortChange="sortChange">
+                        <el-table-column width="50" fixed="left">
+                            <div class="checkbox"></div>
+                        </el-table-column>
+                        <el-table-column label="店铺名称" width="200" fixed="left" prop="store_name"></el-table-column>
+                        <el-table-column label="账户ID" prop="account_id" width="200"></el-table-column>
+                        <el-table-column label="团单类型" prop="type" width="150">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.type==1"><sc-status-indicator type="success"></sc-status-indicator> 团购</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 提货券/代金券</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发券方式" prop="type" width="150">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.code_type==1"><sc-status-indicator type="success"></sc-status-indicator> 平台码</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 商家码</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="物品名称" prop="express_goods" width="150"></el-table-column>
+                        <el-table-column label="物品单位" prop="express_unit" width="150"></el-table-column>
+                        <el-table-column label="发货地址" prop="express_address" width="260"></el-table-column>
+                        <el-table-column label="AppId" prop="appid" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.appid">{{ scope.row.appid }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="联系人" prop="express_name" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.express_name">{{ scope.row.express_name }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="联系电话" prop="express_mobile" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.express_mobile">{{ scope.row.express_mobile }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="状态" prop="status" width="120" align="center">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.status==1"><sc-status-indicator type="success"></sc-status-indicator> 正常</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 禁用</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="创建时间" prop="create_at" width="180"></el-table-column>
+                    </scTable>
+                </div>
+                <div class="main-body-wrap" v-else>
+                    <scTable ref="table" :apiObj="list.apiObj" :hideSetting="true" paginationLayout="total, prev, pager, next" :params="searchKey" @selectionChange="selectionChange" row-key="id" @sortChange="sortChange">
+                        <el-table-column type="selection" width="50" fixed="left"></el-table-column>
+                        <el-table-column label="店铺名称" width="200" fixed="left" prop="store_name"></el-table-column>
+                        <el-table-column label="账户ID" prop="account_id" width="200"></el-table-column>
+                        <el-table-column label="团单类型" prop="type" width="150">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.type==1"><sc-status-indicator type="success"></sc-status-indicator> 团购</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 提货券/代金券</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发券方式" prop="type" width="150">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.code_type==1"><sc-status-indicator type="success"></sc-status-indicator> 平台码</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 商家码</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="物品名称" prop="express_goods" width="150"></el-table-column>
+                        <el-table-column label="物品单位" prop="express_unit" width="150"></el-table-column>
+                        <el-table-column label="发货地址" prop="express_address" width="260"></el-table-column>
+                        <el-table-column label="AppId" prop="appid" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.appid">{{ scope.row.appid }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="联系人" prop="express_name" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.express_name">{{ scope.row.express_name }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="联系电话" prop="express_mobile" width="150">
+                            <template #default="scope">
+                                <span v-if="scope.row.express_mobile">{{ scope.row.express_mobile }}</span>
+                                <span class="status-danger" v-else>未设置</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="状态" prop="status" width="120" align="center">
+                            <template #default="scope">
+                                <div class="status-success" v-if="scope.row.status==1"><sc-status-indicator type="success"></sc-status-indicator> 正常</div>
+                                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 禁用</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="创建时间" prop="create_at" width="180"></el-table-column>
+                    </scTable>
+                </div>
+            </div>
+        </div>
+		<template #footer>
+			<el-button @click="visible=false" >取 消</el-button>
+			<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">确 定</el-button>
+		</template>
+    </el-dialog>
+</template>
+
+<script>
+export default{
+    emits: ['success', 'closed'],
+    props: {
+        multiple: { type: Boolean, default: false },
+    },
+    data(){
+        return {
+            loading: false,
+            mode:"add",
+            titleMap:{
+                add:"选择店铺",
+                edit:"选择店铺"
+            },
+            list: {
+                apiObj: this.$API.merStore.list
+            },
+            visible: false,
+            isSaveing: false,
+            formData:{},
+            searchKey:{},
+            selectData:[]
+        }
+    },
+    methods:{
+        sortChange(event){
+            if (event.order) {
+                var data = {
+                    "field":event.prop,
+                    "order":event.order
+                }
+                this.$refs.table.upData(data)
+            } else {
+                this.$refs.table.reload(this.searchKey)
+            }
+            return ;
+        },
+        submit(){
+            if (this.selectData.length == 0)
+            {
+                return this.$message.error("请选择数据");
+            }
+            this.isSaveing = false;
+            this.visible = false;
+            if (this.multiple){
+                this.$emit('success', this.selectData);
+            } else {
+                this.$emit('success', this.selectData[0]);
+            }
+        },
+        getRowKeys(data){
+            return data.id;
+        },
+        clearAll(){
+            this.selectData = [];
+        },
+        removeUser(index,name){
+            this.selectData.splice(index, 1);
+            console.log(name)
+        },
+        handleCurrentChange(data){
+            this.selectData = [data];
+        },
+        selectionChange(data){
+            this.selectData = data;
+        },
+        searchForm(){
+            this.$refs.table.upData(this.searchKey)
+        },
+        fristName(name){
+            return name.substring(0,1);
+        },
+        open(mode = 'add'){
+            this.mode = mode;
+            this.visible = true;
+            return this
+        },
+        //表单注入数据
+        setData(data){
+            this.formData = data;
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.main{
+    display: flex;
+    border: 1px solid #dfe1e6;
+}
+.main-left{
+    overflow: hidden;
+    flex: 1;
+    .main-body-wrap{
+        position: relative;
+        height: 380px;
+    }
+}
+.main-top{
+    position: relative;
+    padding: 10px 0;
+    border-bottom: 1px solid #dfe1e6;
+    &.is-right{
+        height:53px;
+        display:flex;
+        align-items:center;
+        padding:0 10px;
+        justify-content:space-between;
+    }
+}
+.main-body.is-right{
+    padding: 8px 16px;
+    overflow-y: auto;
+    position: relative;
+    height: calc(100% - 53px);
+    max-height: 380px;
+}
+.mx-1{
+    margin: 0 0.5rem 0.5rem 0;
+}
+.main-right{
+    flex: 0.4;
+}
+.el-form-item--default{
+    margin-bottom: 0;
+}
+.checkbox{
+    border:1px solid #dfe1e6;
+    width: 14px;
+    height: 14px;
+    border-radius: 2px;
+    background-color: #fff;
+    cursor: pointer;
+    position:relative
+}
+.current-row .checkbox{
+    background-color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+}
+.current-row .checkbox:after{
+    transform: rotate(45deg) scaleY(1);
+    box-sizing: content-box;
+    content: "";
+    border: 1px solid #fff;
+    border-left: 0;
+    border-top: 0;
+    height: 7px;
+    left: 4px;
+    position: absolute;
+    top: 1px;
+    width: 3px;
+    transition: transform .15s ease-in 50ms;
+    transform-origin: center;
+}
+</style>

src/views/merchant/user/components/form.vue

@@ -0,0 +1,174 @@
+<template>
+    <el-dialog :title="titleMap[mode]" v-model="visible" :width="600" destroy-on-close @closed="$emit('closed')" :close-on-click-modal="false" :close-on-press-escape="false">
+        <el-form ref="dialogForm" :model="formData" :rules="rules" label-width="100px" label-position="top">
+            <fieldset>
+                <legend><el-tag>基础信息</el-tag></legend>
+                <el-row :gutter="15">
+                    <el-col :span="24" v-if="type == 3">
+                    <el-form-item label="所属店铺" prop="account_id">
+                        <el-input v-model="formData.account_id" placeholder="所属店铺" clearable readonly :style="{ width: '100%' }" @click="selectUser">
+                            <template #append>
+                                <el-tooltip
+                                    effect="dark"
+                                    content="点这里，清除选择"
+                                    placement="top-start"
+                                >
+                                <div class="remove-a" @click="clearUser">清除</div>
+                                </el-tooltip>
+                            </template>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系人" prop="contact_name">
+                            <el-input v-model="formData.contact_name" clearable placeholder="请输入联系人"></el-input>
+                            <div class="el-form-item-msg"></div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="contact_mobile">
+                            <el-input v-model="formData.contact_mobile" clearable placeholder="请输入联系电话"></el-input>
+                            <div class="el-form-item-msg"></div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </fieldset>
+            <fieldset v-if="mode=='add'">
+                <legend><el-tag>账号信息</el-tag></legend>
+                <el-row :gutter="15">
+                    <el-col :span="12">
+                        <el-form-item label="登录账号" prop="username">
+                            <el-input v-model="formData.username" clearable placeholder="请输入登录账号"></el-input>
+                            <div class="el-form-item-msg"></div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="用户名称" prop="truename">
+                            <el-input v-model="formData.truename" clearable placeholder="请输入用户名称"></el-input>
+                            <div class="el-form-item-msg"></div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="登录密码" prop="password">
+                            <el-input type="password" v-model="formData.password" clearable show-password placeholder="请输入登录密码"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="确认密码" prop="password2">
+                            <el-input type="password" v-model="formData.password2" clearable show-password placeholder="请再次输入密码"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </fieldset>
+        </el-form>
+		<template #footer>
+			<el-button @click="visible=false" >取 消</el-button>
+			<el-button type="primary" :loading="isSaveing" @click="submit()">提交</el-button>
+		</template>
+    </el-dialog>
+    <agentData ref="agentData" :multiple="false" @success="handleSuccess"></agentData>
+</template>
+<script>
+import agentData from "@/views/merchant/components/store";
+export default {
+    components: {
+        agentData
+    },
+    data(){
+        return {
+            stepActive:1,
+            loading: false,
+            mode:"add",
+            titleMap:{},
+            visible: false,
+            isSaveing: false,
+            formData:{},
+            type:2,
+            submitState:false,
+            disabled:false,
+            rules:{
+                username: [
+                    {required: true, message: '请输入登录账号'}
+                ],
+                truename: [
+                    {required: true, message: '请输入账号名称'}
+                ],
+                password: [
+                    {required: true, message: '请输入登录密码'}
+                ],
+                password2: [
+                    {required: true, message: '请再次输入密码'},
+                    {validator: (rule, value, callback) => {
+                        if (value !== this.formData.password) {
+                            callback(new Error('两次输入密码不一致!'));
+                        }else{
+                            callback();
+                        }
+                    }}
+                ],
+            }
+        }
+    },
+    methods:{
+        handleSuccess(data){
+            this.formData.account_id = data.account_id;
+        },
+        clearUser(){
+            this.formData.account_id = "";
+        },
+        selectUser(){
+            this.$nextTick(() => {
+                this.$refs.agentData.open()
+            })
+        },
+        open(mode = 'add',type = 2){
+            if (type == 2) {
+                this.titleMap = {
+                    add:"新增店铺用户",
+                    edit:"编辑店铺用户"
+                };
+            } else {
+                this.titleMap = {
+                    add:"新增子账号",
+                    edit:"编辑子账号"
+                };
+            }
+            this.type = type;
+            this.mode = mode;
+            this.visible = true;
+            return this
+        },
+        //表单注入数据
+        setData(data){
+            this.formData = data;
+        },
+        async submit(){
+            var validate = await this.$refs.dialogForm.validate().catch(()=>{});
+            if(!validate){ return false }
+            this.formData.type = this.type;
+            if (this.type == 3 && !this.formData.account_id) {
+                return this.$message.error("请选择店铺");
+            }
+            this.isSaveing = true;
+            let submitData = JSON.parse(JSON.stringify(this.formData));
+            submitData.password = this.$TOOL.crypto.MD5(submitData.password)
+            submitData.password2 = this.$TOOL.crypto.MD5(submitData.password2)
+            var resp = await this.$API.merUser.save.post(submitData);
+            this.isSaveing = false;
+            if (resp.code !== 1) {
+                return this.$message.error(resp.msg);
+            }
+            this.$message.success(resp.msg);
+            this.visible = false;
+            this.formData = {};
+            this.submitState = false;
+            this.$emit("success");
+        }
+    }
+}
+</script>
+<style>
+.mt20 {margin-top: 20px;}
+.login-msg-yzm {display: flex;width: 100%;}
+.login-msg-yzm .el-button {margin-left: 10px;--el-button-size:42px;}
+</style>

src/views/merchant/user/components/option.vue

@@ -0,0 +1,58 @@
+<template>
+    <fieldset>
+        <legend>
+            <el-tag type="info">按需操作</el-tag>
+        </legend>
+        <div class="op-header">
+            <div class="left-panel">
+                <el-button type="primary" icon="el-icon-user" @click="table_add(3)">新增店铺用户</el-button>
+                <el-button type="primary" icon="el-icon-plus" @click="table_add(2)">新增子账户</el-button>
+                <el-button icon="el-icon-document" @click="table_batch_status(1)" :disabled="dataSelect.length>0?false:true">启用</el-button>
+                <el-button icon="el-icon-lock" @click="table_batch_status(0)" :disabled="dataSelect.length>0?false:true">禁用</el-button>
+                <!-- <el-button type="primary" icon="el-icon-download" @click="table_export()">导出</el-button> -->
+            </div>
+        </div>
+    </fieldset>
+    <formMain ref="formMain" @success="handleSuccess"></formMain>
+</template>
+
+<script>
+import formMain from './form';
+export default {
+    components: {
+        formMain
+    },
+    props: {
+        type: { type: String, default: "1" },
+        dataSelect: { type: Array, default: () => [] },
+        dataSelectFull: { type: Array, default: () => [] }
+    },
+    data(){
+        return {
+
+        }
+    },
+    methods: {
+        async table_batch_status(status){
+            if (this.dataSelect.length == 0) {
+                return this.$message.error("请选择修改数据")
+            }
+            let submitData = {"id":this.dataSelect,"value":status,"field":"status","type":"batch"};
+            var resp = await this.$API.store.batch.post(submitData);
+            if (resp.code == 0) {
+                return this.$message.error(resp.msg);
+            }
+            this.$message.success(resp.msg);
+            this.$emit("success");
+        },
+        handleSuccess(){
+            this.$emit("success");
+        },
+        table_add(type){
+            this.$nextTick(() => {
+                this.$refs.formMain.open("add",type)
+            })
+        },
+    }
+}
+</script>

src/views/merchant/user/components/search.vue

@@ -0,0 +1,56 @@
+<template>
+    <fieldset>
+        <legend>
+            <el-tag type="info">条件筛选</el-tag>
+        </legend>
+        <el-form class="lv-form-inline" ref="searchForm" :model="searchKey" label-position="right" label-width="100px">
+            <div class="search-form">
+                <div class="form-left">
+                    <el-row :gutter="10">
+                        <el-col :span="this.$store.state.global.ismobile?12:4">
+                            <el-input v-model="searchKey.name" placeholder="店铺名称" clearable :style="{ width: '100%' }" @keyup.enter="searchForm()">
+                                <template #prepend>账号名称</template>
+                            </el-input>
+                        </el-col>
+                        <el-col :span="this.$store.state.global.ismobile?12:4">
+                            <el-select v-model="searchKey.type" clearable placeholder="请选择" @change="searchForm" :style="{width: '100%'}" class="diy-select">
+                                <el-option value="2" label="子账号"></el-option>
+                                <el-option value="3" label="店铺账号"></el-option>
+                                <template #prefix>类型</template>
+                            </el-select>
+                        </el-col>
+                        <el-col :span="this.$store.state.global.ismobile?12:4">
+                            <el-select v-model="searchKey.status" clearable placeholder="请选择状态" @change="searchForm" :style="{width: '100%'}" class="diy-select">
+                                <el-option value="1" label="冻结"></el-option>
+                                <el-option value="2" label="正常"></el-option>
+                                <template #prefix>状态</template>
+                            </el-select>
+                        </el-col>
+                        <el-col :span="this.$store.state.global.ismobile?12:4">
+                            <el-date-picker v-model="searchKey.create" :style="{width: '100%'}" placeholder="请选择创建时间" start-placeholder="开始时间" end-placeholder="结束时间" type="daterange" range-separator="至" @change="searchForm" />
+                        </el-col>
+                    </el-row>
+                </div>
+                <div class="form-line"></div>
+                <div class="form-right">
+                    <el-button type="primary" icon="el-icon-search" @click="searchForm">搜索</el-button>
+                </div>
+            </div>
+        </el-form>
+    </fieldset>
+</template>
+
+<script>
+export default {
+    data(){
+        return {
+            searchKey:{}
+        }
+    },
+    methods: {
+        searchForm(){
+            this.$emit("success",this.searchKey);
+        }
+    }
+}
+</script>

src/views/merchant/user/components/table.vue

@@ -0,0 +1,133 @@
+<template>
+    <scTable ref="table" :apiObj="list.apiObj" :params="searchKey" @selectionChange="selectionChange" row-key="id">
+        <el-table-column type="selection" width="50" fixed="left"></el-table-column>
+        <el-table-column label="登录账号" prop="truename" width="150" fixed="left">
+            <template #default="scope">
+                <span v-if="scope.row.username">{{ scope.row.username }}</span>
+                <span class="status-danger" v-else>未设置</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="账号昵称" prop="truename" width="150">
+            <template #default="scope">
+                <span v-if="scope.row.truename">{{ scope.row.truename }}</span>
+                <span class="status-danger" v-else>未设置</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="账号类型" prop="status" width="120">
+            <template #default="scope">
+                <div class="status-success" v-if="scope.row.type==2"><sc-status-indicator type="success"></sc-status-indicator> 子账号</div>
+                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 店铺账号</div>
+            </template>
+        </el-table-column>
+        <el-table-column label="所属店铺" prop="status" width="220">
+            <template #default="scope">
+                <div class="status-success" v-if="scope.row.type==2"><sc-status-indicator type="success"></sc-status-indicator> 子账号</div>
+                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> {{ scope.row.account?scope.row.account:'-' }}</div>
+            </template>
+        </el-table-column>
+        <el-table-column label="登录时间" prop="login_at" width="180">
+            <template #default="scope">
+                {{scope.row.login_at?scope.row.login_at:'-'}}
+            </template>
+        </el-table-column>
+        <el-table-column label="登录IP" prop="login_ip" width="180">
+            <template #default="scope">
+                {{scope.row.login_ip?scope.row.login_ip:'-'}}
+            </template>
+        </el-table-column>
+        <el-table-column label="注册时间" prop="create_at" width="180"></el-table-column>
+        <el-table-column label="注册IP" prop="create_ip" width="180"></el-table-column>
+        <el-table-column label="状态" prop="status" width="120" align="center">
+            <template #default="scope">
+                <div class="status-success" v-if="scope.row.status==1"><sc-status-indicator type="success"></sc-status-indicator> 正常</div>
+                <div class="status-danger" v-else><sc-status-indicator type="danger"></sc-status-indicator> 禁用</div>
+            </template>
+        </el-table-column>
+        <el-table-column label="操作" width="200" align="right" fixed="right">
+            <template #default="scope">
+                <el-button-group>
+                    <el-button text type="warning" size="small" @click="table_passwd(scope.row)">修改密码</el-button>
+                    <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
+                        <template #reference>
+                            <el-button text type="danger" size="small">删除</el-button>
+                        </template>
+                    </el-popconfirm>                    
+                </el-button-group>
+            </template>
+        </el-table-column>
+    </scTable>
+    <passwd ref="userPasswd"></passwd>
+</template>
+
+<script>
+import passwd from "@/views/manage/user/password";
+export default {
+    components: {
+        passwd
+    },
+    data(){
+        return {
+            list: {
+                apiObj: this.$API.merUser.list
+            },
+            dataSelect:[],
+            dataSelectFull:[],
+            searchKey:{}
+        }
+    },
+    methods: {
+        async table_del(data){
+            var resp = await this.$API.merUser.del.post({"id":data.id});
+            if (resp.code == 0) {
+                return this.$message.error(resp.msg)
+            }
+            this.$message.success(resp.msg)
+            this.$refs.table.refresh()
+        },
+        table_view(data){
+            this.$nextTick(() => {
+                this.$refs.detailMain.open().setData(data)
+            })
+        },
+        refresh(){
+            this.$refs.table.refresh()
+        },
+        upData(data){
+            this.$refs.table.upData(data)
+        },
+        handleSuccess(){
+            this.$refs.table.refresh()
+        },
+        sortChange(event){
+            if (event.order) {
+                var data = {
+                    "field":event.prop,
+                    "order":event.order
+                }
+                this.$refs.table.upData(data)
+            } else {
+                this.$refs.table.reload(this.searchKey)
+            }
+            return ;
+        },
+        selectionChange(event){
+            this.dataSelect = [];
+            var arr = [];
+            var arrCompany = [];
+            event.forEach(function(val,index){
+                arr[index] = val.id;
+                arrCompany[index] = val;
+            });
+            this.dataSelectFull = arrCompany;
+            this.dataSelect = arr;
+            this.$emit("success",this.dataSelect);
+            this.$emit("successFull",this.dataSelectFull);
+        },
+        table_passwd(row){
+            this.$nextTick(() => {
+                this.$refs.userPasswd.open("edit").setData(row)
+            })
+        },
+    }
+}
+</script>

src/views/merchant/user/index.vue

@@ -0,0 +1,47 @@
+<template>
+    <el-container class="flex-column">
+        <div class="table-search">
+            <search @success="handleSuccess"></search>
+            <optionBtn @success="handleSuccess" :dataSelect="dataSelect" :dataSelectFull="dataSelectFull" type="3"></optionBtn>
+        </div>
+        <el-main class="nopadding">
+            <div class="table-container">
+                <tablePage ref="tablePage" @success="tableHandle" @successFull="tableHandleFull" type="3"></tablePage>
+            </div>
+        </el-main>
+    </el-container>  
+</template>
+
+<script>
+import search from './components/search';
+import optionBtn from './components/option';
+import tablePage from './components/table';
+export default {
+    components: {
+        search,tablePage,optionBtn
+    },
+    data(){
+        return {
+            searchKey:{},
+            dataSelect:[],
+            dataSelectFull:[],
+        }
+    },
+    methods: {
+        tableHandle(data){
+            this.dataSelect = data;
+        },
+        tableHandleFull(data){
+            this.dataSelectFull = data;
+        },
+        handleSuccess(data){
+            this.$refs.tablePage.upData(data)
+        },
+        handleClick(name){
+            this.activeName = name;
+            this.searchKey.type = name;
+            this.$refs.tablePage.upData(this.searchKey)
+        }
+    }
+}
+</script>