更新

优化通道进件
1
2024-02-21 09:13:01 +08:00 · 2024-02-21 09:06:19 +08:00 · 2024-02-20 16:15:11 +08:00 · 2024-02-20 16:13:51 +08:00 · 2024-02-20 10:16:06 +08:00 · 2024-02-20 10:13:42 +08:00
9 changed files with 459 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ 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="en">
+<html lang="zh-cn">

 <head>
  <meta charset="UTF-8" />
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.3",
+	"version": "1.3.7",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -273,3 +273,16 @@ 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
@@ -420,6 +420,25 @@ 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'
+        }
      }
    ]
  },
--- a/src/views/organization/cashier_dot.vue
+++ b/src/views/organization/cashier_dot.vue
@@ -0,0 +1,107 @@
+<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
@@ -0,0 +1,270 @@
+<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,6 +1,17 @@
 <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">
+        :auto-upload="false" @change="selectFile" @remove="removeFile" @preview="previewHandle" v-else>
        <el-icon>
            <Plus />
        </el-icon>
@@ -56,4 +67,35 @@ 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.wxLiteAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
+                <el-input v-model="item.wxLiteAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
                    style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信公众号appld">
-                <el-input v-model="item.wxPubAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
+                <el-input v-model="item.wxPubAppId" :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 || '',
-            wxLiteAppld: form.value[index].wxLiteAppld,
-            wxPubAppld: form.value[index].wxPubAppld,
+            wxLiteAppId: form.value[index].wxLiteAppId,
+            wxPubAppId: form.value[index].wxPubAppId,
            wxPubPath: form.value[index].wxPubPath
        })
        loading.value = false
Author	SHA1	Message	Date
gyq	c356b32b3e	更新	2024-02-21 09:13:01 +08:00
gyq	91ed6c6ef4	优化通道进件	2024-02-21 09:06:19 +08:00
gyq	7beae022d2	1	2024-02-20 16:15:11 +08:00
gyq	17753b55b0	新增收银点	2024-02-20 16:13:51 +08:00
gyq	4e6729fd24	更新版本	2024-02-20 10:16:06 +08:00
gyq	c01152b680	优化	2024-02-20 10:13:42 +08:00