11

2024-02-19 17:12:55 +08:00
11 changed files with 22 additions and 474 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
-dist.zip
 *.local

 # Editor directories and files
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh-cn">
+<html lang="en">

 <head>
  <meta charset="UTF-8" />
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.7",
+	"version": "1.3.3",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -273,16 +273,3 @@ export function updateAuthentication(params) {
    })
 }

-/**
- * 收银点列表
- * @param {*} data 
- * @returns 
- */
-export function queryMerchantCashPlace(params) {
-    return request({
-        method: 'get',
-        url: '/agency/queryMerchantCashPlace',
-        params
-    })
-}
-
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -280,7 +280,7 @@ export const asyncRoutes = [
    component: layout,
    meta: {
      title: '大机构管理',
-      roles: ['MG'],
+      // roles: ['MG'],
      isHide: true
    },
    redirect: '/organization/big_organization',
@@ -310,7 +310,7 @@ export const asyncRoutes = [
    component: layout,
    meta: {
      title: '小机构管理',
-      roles: ['FO'],
+      // roles: ['FO'],
      isHide: true
    },
    redirect: '/mini_organization_manage/mini_organization',
@@ -340,7 +340,7 @@ export const asyncRoutes = [
    component: layout,
    meta: {
      title: '大代理管理',
-      roles: ['FO', 'SO'],
+      // roles: ['FO', 'SO'],
      isHide: true
    },
    redirect: '/agent_manage/agent_list',
@@ -370,7 +370,7 @@ export const asyncRoutes = [
        meta: {
          title: '一级代理',
          icon: 'User',
-          roles: ['FO', 'SO', 'AG']
+          // roles: ['FO', 'SO', 'AG']
        }
      },
      {
@@ -379,7 +379,7 @@ export const asyncRoutes = [
        meta: {
          title: '二级代理',
          icon: 'User',
-          roles: ['FO', 'SO', 'AG', 'FB']
+          // roles: ['FO', 'SO', 'AG', 'FB']
        }
      }
    ]
@@ -389,7 +389,7 @@ export const asyncRoutes = [
    component: layout,
    meta: {
      title: '商家管理',
-      roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
+      // roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
      icon: 'Handbag'
    },
    redirect: '/shop_manage/shop_list',
@@ -420,25 +420,6 @@ export const asyncRoutes = [
          title: '创客申请',
          icon: 'User'
        }
-      },
-      // {
-      //   path: '/shop_manage/cashier_dot',
-      //   component: () => import('@/views/organization/cashier_dot.vue'),
-      //   meta: {
-      //     title: '收银点列表',
-      //     icon: 'PieChart',
-      //     roles: ['MG']
-      //   }
-      // },
-      {
-        path: '/shop_manage/cashierdot_detail',
-        name: 'cashierdot_detail',
-        component: () => import('@/views/organization/cashierdot_detail.vue'),
-        meta: {
-          title: '详情',
-          isHide: true,
-          activeMenu: '/shop_manage/cashier_dot'
-        }
      }
    ]
  },
@@ -447,7 +428,7 @@ export const asyncRoutes = [
    component: layout,
    meta: {
      title: '提现管理',
-      roles: ['FO', 'SO'],
+      // roles: ['FO', 'SO'],
      isHide: true
    },
    redirect: '/withdraw_manage/withdraw_list',
@@ -506,7 +487,7 @@ export const asyncRoutes = [
    meta: {
      title: '推广图片管理',
      isHide: true,
-      roles: ['MG']
+      // roles: ['MG']
    },
    redirect: '/promotion/promotion_list',
    children: [
@@ -526,7 +507,7 @@ export const asyncRoutes = [
    meta: {
      title: 'APP管理',
      icon: 'Iphone',
-      roles: ['MG']
+      // roles: ['MG']
    },
    redirect: '/app_manage/menu_list',
    children: [
@@ -546,7 +527,7 @@ export const asyncRoutes = [
    meta: {
      title: '系统设置',
      icon: 'Setting',
-      roles: ['MG']
+      // roles: ['MG']
    },
    redirect: '/setting/appid_manage',
    children: [
@@ -566,7 +547,7 @@ export const asyncRoutes = [
    meta: {
      title: '消息管理',
      isHide: true,
-      roles: ['MG']
+      // roles: ['MG']
    },
    redirect: '/notice/index',
    children: [
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -12,13 +12,13 @@
          <el-input class="inp" v-model="form.password" clearable autocomplete="new-password" size="large" type="password"
            :prefix-icon="Lock" placeholder="请输入密码" style="width: 100%;" />
        </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
          <el-select v-model="form.userType" placeholder="请选择机构类型" size="large" style="width: 100%;">
            <el-option key="MG" label="平台" value="MG"></el-option>
            <el-option key="FO" label="大机构" value="FO"></el-option>
            <el-option key="SO" label="小机构" value="SO"></el-option>
          </el-select>
-        </el-form-item>
+        </el-form-item> -->
        <!-- <el-form-item prop="code">
          <div class="code-case">
            <el-input class="inp" v-model="form.code" clearable autocomplete="new-password" size="large"
@@ -65,7 +65,7 @@ function getCode(code) {
 const form = reactive({
  loginName: "",
  password: "",
-  userType: 'MG',
+  userType: 'MC',
  code: "",
 });
 /**
--- a/src/views/organization/cashier_dot.vue
+++ b/src/views/organization/cashier_dot.vue
@@ -1,107 +0,0 @@
-<template>
-    <div class="card">
-        <el-space>
-            <el-input v-model="tableOptions.phone" placeholder="请输入手机号" style="width: 200px;" />
-            <el-input v-model="tableOptions.name" placeholder="请输入姓名" style="width: 200px;" />
-            <el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
-            <el-button icon="RefreshRight" @click="resizeTable">重置</el-button>
-        </el-space>
-        <div class="table mt15">
-            <el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
-                <el-table-column prop="name" label="收银点名称"></el-table-column>
-                <el-table-column prop="subcode" label="收银点code"></el-table-column>
-                <el-table-column prop="address" label="收银点地址"></el-table-column>
-                <el-table-column prop="masterName" label="店铺名称"></el-table-column>
-                <el-table-column label="操作" width="120">
-                    <template #default="scope">
-                        <RouterLink
-                            :to="{ name: 'cashierdot_detail', query: { id: scope.row.masterUserId, name: scope.row.name, account: scope.row.subcode, merchantcode: scope.row.masterCode } }">
-                            <el-button type="primary" size="small" icon="Search" v-permission="['MG']">
-                                商户详情
-                            </el-button>
-                        </RouterLink>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="mt15">
-            <el-pagination layout="prev, pager, next, total, sizes, jumper" background
-                v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie"
-                :page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
-                @size-change="paginationChange" @current-change="paginationChange" />
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-import { dayjs, ElMessage } from 'element-plus';
-import { queryMerchantCashPlace } from '@/api/shop.js'
-
-const table = ref(null)
-
-
-// 表格参数
-const tableOptions = reactive({
-    loading: true,
-    phone: '',
-    name: '',
-    list: [],
-    total: 0,
-    pageNum: 1,
-    pageSize: 10
-})
-
-// 重置表格
-function resizeTable() {
-    tableOptions.phone = ''
-    tableOptions.name = ''
-    searchHandle()
-}
-
-// 搜索
-function searchHandle() {
-    tableOptions.pageNum = 1;
-    paginationChange()
-}
-
-// 分页回调
-function paginationChange() {
-    tableOptions.loading = true
-    getUserMarkAjax()
-}
-
-// 审核
-async function checkHandle(row, type) {
-    try {
-        await updateUserMark({
-            status: type,
-            id: row.userId,
-            remark: ''
-        })
-        ElMessage.success('提交成功')
-        resizeTable()
-    } catch (error) {
-    }
-}
-
-// 获取创客审核列表
-async function getUserMarkAjax() {
-    try {
-        const res = await queryMerchantCashPlace({
-            pageNum: tableOptions.pageNum,
-            pageSzie: tableOptions.pageSize
-        })
-        tableOptions.loading = false
-        tableOptions.list = res.list
-        tableOptions.total = res.total
-        table.value.setScrollTop(0)
-    } catch (error) {
-        console.log(error);
-    }
-}
-
-onMounted(() => {
-    getUserMarkAjax()
-})
-</script>
--- a/src/views/organization/cashierdot_detail.vue
+++ b/src/views/organization/cashierdot_detail.vue
@@ -1,270 +0,0 @@
-<template>
-    <div class="card">
-        <div class="nav_wrap">
-            <el-radio-group v-model="type">
-                <el-radio-button :label="item.type" v-for="item in navs" :key="item.type">
-                    {{ item.label }}
-                </el-radio-button>
-            </el-radio-group>
-        </div>
-        <div class="container mt15">
-            <div class="compont_wrap">
-                <component :is="componentList[type]" />
-            </div>
-            <div class="shop_info">
-                <div class="header">
-                    <el-text size="large">商户关联信息</el-text>
-                </div>
-                <div class="title_wrap">
-                    <el-text>身份信息关联（进件成功的）商户数量</el-text>
-                </div>
-                <div class="content">
-                    <div class="row">
-                        <el-space>
-                            <el-text>实名身份证</el-text>
-                            <el-text type="warning" tag="ins">{{ authInfo.CertNoCount }}</el-text>
-                        </el-space>
-                    </div>
-                    <div class="row">
-                        <el-space>
-                            <el-text>结算身份证</el-text>
-                            <el-text type="warning" tag="ins">{{ authInfo.countMbiName }}</el-text>
-                        </el-space>
-                    </div>
-                    <div class="row">
-                        <el-space>
-                            <el-text>同名商户</el-text>
-                            <el-text type="warning" tag="ins">{{ authInfo.countAccountCount }}</el-text>
-                        </el-space>
-                    </div>
-                </div>
-                <div class="title_wrap">
-                    <el-text>用户IP记录</el-text>
-                </div>
-                <div class="mt15">
-                    <el-table :data="tableOptions.list" border height="200" v-loading="tableOptions.loading">
-                        <el-table-column prop="ip" label="IP地址"></el-table-column>
-                        <el-table-column prop="remark" label="操作"></el-table-column>
-                        <el-table-column prop="createtime" label="操作时间">
-                            <template #default="scope">
-                                {{ dayjs(scope.row.createtime).format('YYYY-MM-DD HH:mm:ss') }}
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                    <div class="mt15">
-                        <el-pagination layout="prev, pager, next, total, sizes, jumper" background
-                            v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie" small
-                            :page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
-                            @size-change="paginationChange" @current-change="paginationChange" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { connectInfo, merchBaseInfo, merchantInfoDetail, merchBaseAccount, messageChannel, userIpPage, merchLicense } from '@/api/shop.js'
-
-import authentication from './components/authentication.vue'
-import shopInfo from './components/shopInfo.vue'
-import settleInfo from './components/settleInfo.vue'
-import aisleInfo from './components/aisleInfo.vue'
-import businessLicense from './components/businessLicense.vue'
-
-import { useRoute } from 'vue-router'
-import { reactive } from 'vue'
-import { dayjs } from 'element-plus'
-const route = useRoute()
-
-const authInfo = ref({})
-
-const type = ref(1)
-
-const componentList = {
-    1: authentication,
-    2: shopInfo,
-    3: businessLicense,
-    4: settleInfo,
-    5: aisleInfo
-}
-
-const navs = reactive([])
-
-// 表格参数
-const tableOptions = reactive({
-    loading: true,
-    list: [],
-    total: 0,
-    pageNum: 1,
-    pageSzie: 10
-})
-
-// 分页回调
-function paginationChange() {
-    tableOptions.loading = true
-    userIpPageAjax()
-}
-
-// 实名认证信息页面(实名个数)
-async function connectInfoAjax() {
-    try {
-        const res = await connectInfo(route.query.id)
-        authInfo.value = res
-    } catch (error) {
-        console.log('实名认证信息页面error：', error)
-    }
-}
-
-// ip记录
-async function userIpPageAjax() {
-    try {
-        const res = await userIpPage({
-            userId: route.query.id,
-            currPage: tableOptions.pageNum,
-            size: tableOptions.pageSzie
-        })
-        tableOptions.loading = false
-        tableOptions.list = res.list
-        tableOptions.total = res.total
-    } catch (error) {
-        console.log('ip记录', error)
-    }
-}
-
-// 实名认证信息
-async function merchantInfoDetailAjax() {
-    try {
-        const res = await merchantInfoDetail(route.query.id)
-        if (res.bankCard.bankname) {
-            navs.push(
-                {
-                    type: 1,
-                    label: '实名认证信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.error('实名认证信息===', error)
-    }
-}
-
-// 商户基本信息
-async function merchBaseInfoAjax() {
-    try {
-        const res = await merchBaseInfo(route.query.id)
-        if (res.merchantBaseInfo.mccname) {
-            navs.push(
-                {
-                    type: 2,
-                    label: '商户基本信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('商户基本信息===', error)
-    }
-}
-
-// 营业执照信息
-async function merchLicenseAjax() {
-    try {
-        const res = await merchLicense(route.query.id)
-        if (res.license.principalperson) {
-            navs.push(
-                {
-                    type: 3,
-                    label: '营业执照信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('商户基本信息===', error)
-    }
-}
-
-// 结算信息
-async function merchBaseAccountAjax() {
-    try {
-        const res = await merchBaseAccount(route.query.id)
-        if (res.D0.bankCard) {
-            navs.push(
-                {
-                    type: 4,
-                    label: '结算信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('结算信息===', error)
-    }
-}
-
-// 通道进件信息
-async function messageChannelAjax() {
-    try {
-        const res = await messageChannel(route.query.id, route.query.merchantcode)
-        if (res.merchantChannelMessage.length) {
-            navs.push(
-                {
-                    type: 5,
-                    label: '通道进件信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('通道进件信息===', error)
-    }
-}
-
-onMounted(async () => {
-    tableOptions.loading = false
-    connectInfoAjax()
-    userIpPageAjax()
-    await merchantInfoDetailAjax()
-    await merchBaseInfoAjax()
-    await merchLicenseAjax()
-    await merchBaseAccountAjax()
-    await messageChannelAjax()
-    type.value = navs[0].type
-    if (route.query.type && route.query.type == 'msg1') {
-        type.value = 5
-    }
-})
-</script>
-
-<style scoped lang="scss">
-@import './components/common.scss';
-
-.nav_wrap {
-    padding-bottom: 15px;
-    border-bottom: 1px solid #ececec;
-}
-
-.container {
-    display: flex;
-
-    .compont_wrap {
-        flex: 2;
-        padding-right: 20px;
-    }
-
-    .shop_info {
-        flex: 1;
-
-        .header {
-            padding-bottom: 14px;
-        }
-
-        .content {
-            padding: 14px 20px;
-
-            .row {
-                &:not(:first-child) {
-                    margin-top: 14px;
-                }
-            }
-        }
-    }
-}
-</style>
--- a/src/views/organization/components/UploadCard.vue
+++ b/src/views/organization/components/UploadCard.vue
@@ -1,17 +1,6 @@
 <template>
-    <div class="img_box" v-if="fileList.length">
-        <el-image :src="fileList[0].url" style="width: 150px;height: 150px;display: block;" fit="cover"></el-image>
-        <div class="mask">
-            <el-icon @click="previewHandle({ url: fileList[0].url })">
-                <Search />
-            </el-icon>
-            <el-icon @click="fileList = []">
-                <Delete />
-            </el-icon>
-        </div>
-    </div>
    <el-upload ref="uploadRef" v-model:file-list="fileList" list-type="picture-card" :limit="1" :on-exceed="handleExceed"
-        :auto-upload="false" @change="selectFile" @remove="removeFile" @preview="previewHandle" v-else>
+        :auto-upload="false" @change="selectFile" @remove="removeFile" @preview="previewHandle">
        <el-icon>
            <Plus />
        </el-icon>
@@ -67,35 +56,4 @@ defineExpose({
 .img {
    width: 100%;
 }
-
-.img_box {
-    position: relative;
-    border-radius: 5px;
-    overflow: hidden;
-    width: 150px;
-    height: 150px;
-
-    &:hover {
-        cursor: pointer;
-
-        .mask {
-            display: flex;
-        }
-    }
-
-    .mask {
-        width: 100%;
-        height: 100%;
-        position: absolute;
-        top: 0;
-        left: 0;
-        background-color: rgba(0, 0, 0, 0.5);
-        display: none;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        font-size: 18px;
-        gap: 20px;
-    }
-}
 </style>
--- a/src/views/organization/components/aisleInfo.vue
+++ b/src/views/organization/components/aisleInfo.vue
@@ -26,11 +26,11 @@
                <el-input v-model="item.valid" disabled placeholder="请输入默认结算方式" style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信小程序appid">
-                <el-input v-model="item.wxLiteAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
+                <el-input v-model="item.wxLiteAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
                    style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信公众号appld">
-                <el-input v-model="item.wxPubAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
+                <el-input v-model="item.wxPubAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
                    style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信公众号支付路径">
@@ -105,8 +105,8 @@ async function submitHandle(state, index) {
            errMsg: form.value[index].remake || '',
            userId: route.query.id,
            channelId: form.value[index].channel || '',
-            wxLiteAppId: form.value[index].wxLiteAppId,
-            wxPubAppId: form.value[index].wxPubAppId,
+            wxLiteAppld: form.value[index].wxLiteAppld,
+            wxPubAppld: form.value[index].wxPubAppld,
            wxPubPath: form.value[index].wxPubPath
        })
        loading.value = false
--- a/src/views/organization/shop_list.vue
+++ b/src/views/organization/shop_list.vue
@@ -252,7 +252,7 @@
                        <RouterLink
                            :to="{ name: 'shop_detail', query: { id: scope.row.id, name: scope.row.agencyName, account: scope.row.agencyCode, merchantcode: scope.row.merchantBaseInfo.merchantCode } }"
                            v-else>
-                            <el-button type="primary" size="small" icon="Search" v-permission="['MG']">
+                            <el-button type="primary" size="small" icon="Search" >
                                商户详情
                            </el-button>
                        </RouterLink>