From 9279a7d6cb35c093b6e3d58a4d8fe0acf8efc3d0 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 4 Jul 2022 16:24:35 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=B8=AD=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/merchant.js             |  22 +++
 src/store/modules/chat/chat.js      |   4 +-
 src/store/modules/goods/comment.js  |   8 +-
 src/store/modules/pay/merchant.js   |  60 +++++++
 src/views/pay/application/index.vue | 166 +++++++++++++++++++
 src/views/pay/merchant/index.vue    | 242 ++++++++++++++++++++++++++++
 6 files changed, 494 insertions(+), 8 deletions(-)
 create mode 100644 src/api/pay/merchant.js
 create mode 100644 src/store/modules/pay/merchant.js
 create mode 100644 src/views/pay/application/index.vue
 create mode 100644 src/views/pay/merchant/index.vue

diff --git a/src/api/pay/merchant.js b/src/api/pay/merchant.js
new file mode 100644
index 0000000..28c7262
--- /dev/null
+++ b/src/api/pay/merchant.js
@@ -0,0 +1,22 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:20:02
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-04 15:50:39
+ * @Description: file content
+ */
+import request from '@/utils/request.js';
+export const getMerchantList = (params) => {
+    return request({
+        url: '/payCenter/mchInfo/page',
+        method: 'get',
+        params,
+    });
+};
+export const getMerchantPlatform = (params) => {
+    return request({
+        url: '/payCenter/mchInfo/mchCode',
+        method: 'get',
+        params,
+    });
+};
diff --git a/src/store/modules/chat/chat.js b/src/store/modules/chat/chat.js
index 8edd291..a8bdfa4 100644
--- a/src/store/modules/chat/chat.js
+++ b/src/store/modules/chat/chat.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-07 15:41:05
  * @LastEditors: ch
- * @LastEditTime: 2022-06-14 15:26:44
+ * @LastEditTime: 2022-07-04 11:34:14
  * @Description: file content
  */
 import * as api from '@/api/chat';
@@ -166,7 +166,7 @@ const actions = {
     /**
      * 提交转移会话
      */
-    submitTransferSession: ({}, data) => {
+    submitTransferSession: (context, data) => {
         return api
             .transferCustomerService({
                 storeId: 1,
diff --git a/src/store/modules/goods/comment.js b/src/store/modules/goods/comment.js
index 62c6461..54f8239 100644
--- a/src/store/modules/goods/comment.js
+++ b/src/store/modules/goods/comment.js
@@ -150,10 +150,6 @@ const actions = {
             data.commentTimeBegin = data.dateRange[0];
             data.commentTimeEnd = data.dateRange[1];
         }
-        if (data.scoreList) {
-            data.commentScoreList = data.scoreList.join(',');
-            delete data.scoreList;
-        }
         delete data.dateRange;
         delete data.pagingCode;
         const res = await api.commentList({
@@ -171,7 +167,7 @@ const actions = {
             commit('setTotal', res?.total || 0);
         }
     },
-    async updateShow({}, params) {
+    async updateShow(context, params) {
         const res = await api.updateCommentShow(params);
         if (!res) {
             ElMessage.error('状态更新失败！');
@@ -188,7 +184,7 @@ const actions = {
         commit('setDetail', res);
         return Promise.resolve(res);
     },
-    async add({}, data) {
+    async add(context, data) {
         const res = await api.commentAdd(data);
         if (!res) {
             ElMessage.error('回复失败');
diff --git a/src/store/modules/pay/merchant.js b/src/store/modules/pay/merchant.js
new file mode 100644
index 0000000..9dfa924
--- /dev/null
+++ b/src/store/modules/pay/merchant.js
@@ -0,0 +1,60 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:21:30
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-04 16:22:14
+ * @Description: file content
+ */
+import * as api from '@/api/pay/merchant.js';
+const state = {
+    list: [],
+    detail: {},
+    total: 0,
+    opts: {
+        status: [
+            {
+                value: false,
+                label: '启用',
+            },
+            {
+                value: true,
+                label: '禁用',
+            },
+        ],
+        platform: [],
+    },
+};
+const getters = {};
+const mutations = {
+    setList: (state, data) => (state.list = data),
+    setPlatform: (state, data) => (state.opts.platform = data),
+    setTotal: (state, data) => (state.total = data),
+    setDetail: (state, data) => (state.detail = data),
+};
+const actions = {
+    async search({ rootGetters, commit }, params) {
+        let data = { ...params };
+        let pagingCode = params.pagingCode;
+        const res = await api.getMerchantList({
+            ...rootGetters['local/page'](pagingCode),
+            ...data,
+        });
+        if (res) {
+            commit('setList', res?.records || []);
+            commit('setTotal', res?.total || 0);
+        }
+    },
+    async getMerchantPlatform({ commit }, params) {
+        const res = await api.getMerchantPlatform();
+        if (res) {
+            commit('setPlatform', res || []);
+        }
+    },
+};
+
+export default {
+    state,
+    getters,
+    mutations,
+    actions,
+};
diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
new file mode 100644
index 0000000..eda6813
--- /dev/null
+++ b/src/views/pay/application/index.vue
@@ -0,0 +1,166 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-15 17:29:32
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-04 16:12:49
+ * @Description: file content
+-->
+<template>
+    <table-list
+        v-loading="loading"
+        :operation="['search']"
+        :code="_pagingCode"
+        :config="config"
+        :data="list"
+        :total="total"
+        @search="handleSearch"
+        :reset="handleReset"
+    >
+        <template #search>
+            <el-form inline>
+                <el-form-item label="商户名称">
+                    <el-input v-model="state.condition.mchName" />
+                </el-form-item>
+                <el-form-item label="商户ID">
+                    <el-input v-model="state.condition.mchId" />
+                </el-form-item>
+                <el-form-item label="商户平台">
+                    <el-select v-model="state.condition.mchCode">
+                        <el-option
+                            v-for="(item, idx) in opts.platform"
+                            :key="idx"
+                            :label="item.text"
+                            :value="item.code"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="商户状态">
+                    <el-select v-model="state.condition.isDisabled">
+                        <el-option
+                            v-for="(item, idx) in opts.status"
+                            :key="idx"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </template>
+
+        <template #operation="{ selection }">
+            <div class="batch-show-hide" v-if="selection.length">
+                <el-select v-model="allShowHideVal">
+                    <el-option
+                        v-for="(item, idx) in opts.isShow"
+                        :key="idx"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+                <el-button type="primary" @click="handleAllShowHide(selection)">确定</el-button>
+            </div>
+        </template>
+    </table-list>
+</template>
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElSwitch from '@/components/extra/ElSwitch.vue';
+    const router = useRouter();
+    const store = useStore();
+    const loading = ref(false);
+    // 页面字典表数据
+    const opts = computed(() => store.state.merchant.opts);
+    // 表格数据
+    const list = computed(() => _.cloneDeep(store.state.merchant.list));
+    const total = computed(() => store.state.merchant.total);
+    // 分页code需要使用此code到全局sotre取分页参数
+    const _pagingCode = 'PayMerchantManagement';
+    // 表格查询参数
+    const _condition = {
+        mchCode: '',
+        mchId: '',
+        mchName: '',
+        isDisabled: null,
+    };
+    const state = reactive({
+        condition: { ..._condition },
+    });
+
+    /**
+     * 搜索
+     */
+    const handleSearch = async () => {
+        loading.value = true;
+        await store.dispatch('merchant/search', { ...state.condition, pagingCode: _pagingCode });
+        loading.value = false;
+    };
+
+    store.dispatch('merchant/getMerchantPlatform');
+    onActivated(handleSearch);
+    /**
+     * 重置
+     */
+    const handleReset = () => {
+        state.condition = { ..._condition };
+    };
+
+    const config = reactive({
+        columns: [
+            {
+                label: '商户名称',
+                align: 'left',
+                prop: 'mchName',
+            },
+            {
+                label: '商户ID',
+                align: 'left',
+                prop: 'mchId',
+            },
+            {
+                label: '商户平台',
+                width: 180,
+                slots: {
+                    default: ({ row }) => ({ opts }),
+                },
+            },
+            {
+                label: '商户状态',
+                width: 120,
+                prop: 'isDisabledDesc',
+            },
+            {
+                label: '创建时间',
+                prop: 'createTime',
+                width: 120,
+            },
+            {
+                label: '操作',
+                width: 70,
+                slots: {
+                    default: ({ row }) => (
+                        <ElButton type="text" onClick={() => handleDetail(row.id)}>
+                            查看
+                        </ElButton>
+                    ),
+                },
+            },
+        ],
+    });
+</script>
+<style lang="less" scoped>
+    .batch-show-hide {
+        margin-left: 20px;
+    }
+    :deep(.row-ellipsis) {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+    }
+    :deep(.ctx-link) {
+        cursor: pointer;
+        &:hover {
+            color: var(--el-color-primary);
+        }
+    }
+</style>
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
new file mode 100644
index 0000000..f3ada3b
--- /dev/null
+++ b/src/views/pay/merchant/index.vue
@@ -0,0 +1,242 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-15 17:29:32
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-04 11:38:11
+ * @Description: file content
+-->
+<template>
+    <div>
+        <table-list
+            v-loading="loading"
+            :operation="['search']"
+            :code="_pagingCode"
+            :config="config"
+            :data="list"
+            :total="total"
+            @search="handleSearch"
+            :reset="handleReset"
+        >
+            <template #search>
+                <el-form inline>
+                    <el-form-item label="商户平台" prop="productName">
+                        <el-input v-model="state.condition.productName" />
+                    </el-form-item>
+                    <el-form-item label="商户名称">
+                        <el-input v-model="state.condition.userName" />
+                    </el-form-item>
+                    <el-form-item label="商户ID" prop="phone">
+                        <el-input v-model="state.condition.phone" />
+                    </el-form-item>
+                    <el-form-item label="商户状态" prop="status">
+                        <el-select v-model="state.condition.isShow">
+                            <el-option
+                                v-for="(item, idx) in opts.isShow"
+                                :key="idx"
+                                :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+            </template>
+
+            <template #operation="{ selection }">
+                <div class="batch-show-hide" v-if="selection.length">
+                    <el-select v-model="allShowHideVal">
+                        <el-option
+                            v-for="(item, idx) in opts.isShow"
+                            :key="idx"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                    <el-button type="primary" @click="handleAllShowHide(selection)">确定</el-button>
+                </div>
+            </template>
+        </table-list>
+    </div>
+</template>
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElSwitch from '@/components/extra/ElSwitch.vue';
+    const router = useRouter();
+    const store = useStore();
+    const loading = ref(false);
+    // 页面字典表数据
+    const opts = computed(() => store.state.comment.opts);
+    // 表格数据
+    const list = computed(() => _.cloneDeep(store.state.comment.list));
+    const total = computed(() => store.state.comment.total);
+    // 分页code需要使用此code到全局sotre取分页参数
+    const _pagingCode = 'CommentManagement';
+    // 表格查询参数
+    const _condition = {
+        productName: '',
+        userName: '',
+        phone: '',
+        scoreList: [],
+        isShow: '',
+        dateRange: '',
+    };
+    const state = reactive({
+        condition: { ..._condition },
+    });
+    // 批量操作的值
+    const allShowHideVal = ref(true);
+
+    // store.dispatch('comment/search', { pagingCode: _pagingCode });
+
+    /**
+     * 搜索
+     */
+    const handleSearch = async () => {
+        loading.value = true;
+        await store.dispatch('comment/search', { ...state.condition, pagingCode: _pagingCode });
+        loading.value = false;
+    };
+    onActivated(handleSearch);
+    /**
+     * 重置
+     */
+    const handleReset = () => {
+        state.condition = { ..._condition };
+    };
+    /**
+     * 单行操作显示隐藏
+     *
+     */
+    const handleShowHide = async (row) => {
+        loading.value = true;
+        try {
+            await store.dispatch('comment/updateShow', {
+                idList: [row.id],
+                isShow: row.isShow,
+            });
+        } catch (e) {
+            row.isShow = !row.isShow;
+        }
+        loading.value = false;
+    };
+    /**
+     * 批量操作显示隐藏
+     */
+    const handleAllShowHide = async (selection) => {
+        loading.value = true;
+        let val = allShowHideVal.value;
+        try {
+            await store.dispatch('comment/updateShow', {
+                idList: selection.map((i) => i.id),
+                isShow: val,
+            });
+        } catch (e) {
+            val = !val;
+        }
+        loading.value = false;
+        selection.forEach((item) => {
+            item.isShow = val;
+        });
+    };
+    const handleDetail = (id) => {
+        router.push({
+            name: 'CommentDetail',
+            params: {
+                id: id,
+            },
+        });
+    };
+
+    const config = reactive({
+        columns: [
+            {
+                type: 'selection',
+                fixed: 'left',
+                width: 60,
+            },
+            {
+                label: '商品名称',
+                width: 180,
+                align: 'left',
+                slots: {
+                    default: ({ row }) => <div class="row-ellipsis">{row.productName}</div>,
+                },
+            },
+            {
+                label: '评价内容',
+                align: 'left',
+                slots: {
+                    default: ({ row }) => (
+                        <div class="row-ellipsis ctx-link" onClick={() => handleDetail(row.id)}>
+                            {row.commentContent}
+                        </div>
+                    ),
+                },
+            },
+            {
+                label: '评分',
+                prop: 'scoreName',
+                width: 70,
+            },
+            {
+                label: '用户',
+                width: 120,
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <p class="row-ellipsis">{row.userName}</p>
+                            <p>{row.phone}</p>
+                        </div>
+                    ),
+                },
+            },
+            {
+                label: '评价时间',
+                prop: 'time',
+                width: 120,
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <p>{row.createTime.split(' ')[0]}</p>
+                            <p>{row.createTime.split(' ')[1]}</p>
+                        </div>
+                    ),
+                },
+            },
+            {
+                label: '显示',
+                width: 80,
+                slots: {
+                    default: ({ row }) => <ElSwitch v-model={row.isShow} onChange={() => handleShowHide(row)} />,
+                },
+            },
+            {
+                label: '操作',
+                width: 70,
+                slots: {
+                    default: ({ row }) => (
+                        <ElButton type="text" onClick={() => handleDetail(row.id)}>
+                            查看
+                        </ElButton>
+                    ),
+                },
+            },
+        ],
+    });
+</script>
+<style lang="less" scoped>
+    .batch-show-hide {
+        margin-left: 20px;
+    }
+    :deep(.row-ellipsis) {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+    }
+    :deep(.ctx-link) {
+        cursor: pointer;
+        &:hover {
+            color: var(--el-color-primary);
+        }
+    }
+</style>

From f58303e37f31e3083d248004840d8abb70873396 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 6 Jul 2022 11:25:05 +0800
Subject: [PATCH 02/15] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/merchant.js               |  35 +++-
 src/store/modules/pay/merchant.js     |  57 ++++++-
 src/views/pay/application/add.vue     |  11 ++
 src/views/pay/application/detail.vue  |  11 ++
 src/views/pay/application/index.vue   |  28 +---
 src/views/pay/merchant/form/ali.vue   | 126 ++++++++++++++
 src/views/pay/merchant/form/index.vue | 124 ++++++++++++++
 src/views/pay/merchant/form/wx.vue    | 182 ++++++++++++++++++++
 src/views/pay/merchant/index.vue      | 229 +++++++++-----------------
 vite.config.js                        |   2 +-
 10 files changed, 628 insertions(+), 177 deletions(-)
 create mode 100644 src/views/pay/application/add.vue
 create mode 100644 src/views/pay/application/detail.vue
 create mode 100644 src/views/pay/merchant/form/ali.vue
 create mode 100644 src/views/pay/merchant/form/index.vue
 create mode 100644 src/views/pay/merchant/form/wx.vue

diff --git a/src/api/pay/merchant.js b/src/api/pay/merchant.js
index 28c7262..72b140e 100644
--- a/src/api/pay/merchant.js
+++ b/src/api/pay/merchant.js
@@ -2,10 +2,43 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-04 15:50:39
+ * @LastEditTime: 2022-07-06 10:09:07
  * @Description: file content
  */
 import request from '@/utils/request.js';
+export const create = (data) => {
+    return request({
+        url: '/payCenter/mchInfo',
+        method: 'post',
+        data,
+    });
+};
+export const del = (mchPrimaryId) => {
+    return request({
+        url: `/payCenter/mchInfo/${mchPrimaryId}`,
+        method: 'delete',
+    });
+};
+export const detail = (mchPrimaryId) => {
+    return request({
+        url: `/payCenter/mchInfo/${mchPrimaryId}`,
+        method: 'get',
+    });
+};
+export const update = (data) => {
+    return request({
+        url: '/payCenter/mchInfo',
+        method: 'put',
+        data,
+    });
+};
+export const updateStatus = (params) => {
+    return request({
+        url: `/payCenter/mchInfo/updateStatus`,
+        method: 'put',
+        params,
+    });
+};
 export const getMerchantList = (params) => {
     return request({
         url: '/payCenter/mchInfo/page',
diff --git a/src/store/modules/pay/merchant.js b/src/store/modules/pay/merchant.js
index 9dfa924..6449959 100644
--- a/src/store/modules/pay/merchant.js
+++ b/src/store/modules/pay/merchant.js
@@ -2,11 +2,13 @@
  * @Author: ch
  * @Date: 2022-07-04 15:21:30
  * @LastEditors: ch
- * @LastEditTime: 2022-07-04 16:22:14
+ * @LastEditTime: 2022-07-06 11:16:50
  * @Description: file content
  */
 import * as api from '@/api/pay/merchant.js';
+import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
 const state = {
+    code: 'PayMerchantManagement',
     list: [],
     detail: {},
     total: 0,
@@ -33,18 +35,59 @@ const mutations = {
 };
 const actions = {
     async search({ rootGetters, commit }, params) {
-        let data = { ...params };
-        let pagingCode = params.pagingCode;
         const res = await api.getMerchantList({
-            ...rootGetters['local/page'](pagingCode),
-            ...data,
+            ...rootGetters['local/page'](state.code),
+            ...params,
         });
         if (res) {
-            commit('setList', res?.records || []);
+            commit('setList', res?.records.map((i) => ({ ...i, isShow: !i.isDisabled })) || []);
             commit('setTotal', res?.total || 0);
         }
     },
-    async getMerchantPlatform({ commit }, params) {
+    async save({ dispatch }, data) {
+        let save = data.mchPrimaryId ? api.update : api.create;
+        let res = await save(data);
+        if (res) {
+            ElMessage.success('保存成功');
+            dispatch('search');
+        } else {
+            ElMessage.error('保存失败');
+        }
+        return res;
+    },
+    detail: async (context, id) => {
+        let res = await api.detail(id);
+        if (!res) {
+            ElMessage.error('加载详情失败');
+        }
+        return res;
+    },
+    del: async ({ dispatch }, id) => {
+        try {
+            await ElMessageBox.confirm('数据删除后无法恢复，确定要删除吗?', '危险操作');
+            let res = await api.del(id);
+            if (res) {
+                ElMessage.success('删除成功');
+                dispatch('search');
+            } else {
+                ElMessage.error('删除失败');
+            }
+            return res;
+        } catch (e) {
+            console.info('取消删除', e);
+        }
+    },
+    async updateStatus({ dispatch }, data) {
+        let res = await api.updateStatus(data);
+        if (res) {
+            ElMessage.success('保存成功');
+            dispatch('search');
+        } else {
+            ElMessage.error('保存失败');
+        }
+        return res;
+    },
+    async getMerchantPlatform({ commit }) {
         const res = await api.getMerchantPlatform();
         if (res) {
             commit('setPlatform', res || []);
diff --git a/src/views/pay/application/add.vue b/src/views/pay/application/add.vue
new file mode 100644
index 0000000..0563eff
--- /dev/null
+++ b/src/views/pay/application/add.vue
@@ -0,0 +1,11 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-04 16:37:25
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-04 16:38:00
+ * @Description: file content
+-->
+<template>
+    <div></div>
+</template>
+<script setup lang="jsx"></script>
diff --git a/src/views/pay/application/detail.vue b/src/views/pay/application/detail.vue
new file mode 100644
index 0000000..d39e58f
--- /dev/null
+++ b/src/views/pay/application/detail.vue
@@ -0,0 +1,11 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-04 16:34:07
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-04 16:34:13
+ * @Description: file content
+-->
+<template></template>
+<script lang="jsx">
+    export default {};
+</script>
diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
index eda6813..c66affc 100644
--- a/src/views/pay/application/index.vue
+++ b/src/views/pay/application/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-04 16:12:49
+ * @LastEditTime: 2022-07-04 16:56:20
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,9 @@
         :config="config"
         :data="list"
         :total="total"
+        title="商户"
         @search="handleSearch"
+        @create="handleCreate()"
         :reset="handleReset"
     >
         <template #search>
@@ -46,20 +48,6 @@
                 </el-form-item>
             </el-form>
         </template>
-
-        <template #operation="{ selection }">
-            <div class="batch-show-hide" v-if="selection.length">
-                <el-select v-model="allShowHideVal">
-                    <el-option
-                        v-for="(item, idx) in opts.isShow"
-                        :key="idx"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-                <el-button type="primary" @click="handleAllShowHide(selection)">确定</el-button>
-            </div>
-        </template>
     </table-list>
 </template>
 <script setup lang="jsx">
@@ -103,7 +91,7 @@
     const handleReset = () => {
         state.condition = { ..._condition };
     };
-
+    const handleCreate = () => {};
     const config = reactive({
         columns: [
             {
@@ -118,10 +106,8 @@
             },
             {
                 label: '商户平台',
-                width: 180,
-                slots: {
-                    default: ({ row }) => ({ opts }),
-                },
+                width: 120,
+                prop: 'mchCode',
             },
             {
                 label: '商户状态',
@@ -131,7 +117,7 @@
             {
                 label: '创建时间',
                 prop: 'createTime',
-                width: 120,
+                width: 160,
             },
             {
                 label: '操作',
diff --git a/src/views/pay/merchant/form/ali.vue b/src/views/pay/merchant/form/ali.vue
new file mode 100644
index 0000000..cf37312
--- /dev/null
+++ b/src/views/pay/merchant/form/ali.vue
@@ -0,0 +1,126 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-04 17:57:55
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-06 10:18:14
+ * @Description: file content
+-->
+<template>
+    <el-form labelWidth="160px" ref="formEl" :rules="rules" :model="form">
+        <el-form-item label="公钥" prop="publicKey">
+            <el-input
+                type="textarea"
+                maxlength="400"
+                show-word-limit
+                :placeholder="modelValue.hasPublicKey"
+                v-model="form.publicKey"
+            />
+        </el-form-item>
+        <el-form-item label="公钥证书" prop="aliPayCertUrl">
+            <el-upload action="none" accept=".crt" :show-file-list="false" :http-request="handleUploadCert">
+                <el-button type="success" v-if="modelValue.hasAliPayCert || form.aliPayCertUrl">
+                    已上传，点击重新上传
+                </el-button>
+                <el-button type="primary" v-else>上传</el-button>
+            </el-upload>
+        </el-form-item>
+        <el-form-item label="根证书" prop="aliPayRootCertUrl">
+            <el-upload action="none" accept=".crt" :show-file-list="false" :http-request="handleUploadRootCert">
+                <el-button type="success" v-if="modelValue.hasAliPayRootCert || form.aliPayRootCertUrl">
+                    已上传，点击重新上传
+                </el-button>
+                <el-button type="primary" v-else>上传</el-button>
+            </el-upload>
+        </el-form-item>
+    </el-form>
+</template>
+<script setup lang="jsx">
+    import { upload } from '@/api/file';
+    const route = useRoute();
+    const emits = defineEmits(['update:modelValue']);
+    const attrs = useAttrs();
+    const createRules = {
+        publicKey: [{ required: true, message: '公钥不能为空' }],
+        aliPayCertUrl: [{ required: true, message: '请上传公钥证书' }],
+        aliPayRootCertUrl: [{ required: true, message: '请上传根证书' }],
+    };
+    const editRules = {
+        publicKey: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasPublicKey) {
+                        cb(new Error('公钥不能为空'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        aliPayCertUrl: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasAliPayCert) {
+                        cb(new Error('请上传公钥证书'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        aliPayRootCertUrl: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasAliPayRootCert) {
+                        cb(new Error('请上传根证书'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+    };
+    const rules = computed(() => {
+        return route.name === 'UpdateMerchant' ? editRules : createRules;
+    });
+    const form = reactive({
+        publicKey: '',
+        aliPayRootCertUrl: '',
+        aliPayCertUrl: '',
+    });
+    const formEl = ref();
+    const modelValue = computed(() => attrs.modelValue);
+
+    watch(
+        () => toRefs(form),
+        () => {
+            emits('update:modelValue', Object.assign(unref(modelValue), form));
+        }
+    );
+    /**
+     * 上传公钥证书
+     */
+    const handleUploadCert = async ({ file }) => {
+        const res = await upload('payCenter', 'merchant/', file);
+        form.aliPayCertUrl = res;
+    };
+    /**
+     * 上传根证书
+     */
+    const handleUploadRootCert = async ({ file }) => {
+        const res = await upload('payCenter', 'merchant/', file);
+        form.aliPayRootCertUrl = res;
+    };
+    /**
+     * 验证方法暴露给父组件
+     */
+    const validate = async () => {
+        await formEl.value.validate();
+    };
+    const resetFields = () => {
+        formEl.value.resetFields();
+    };
+    defineExpose({
+        validate,
+        resetFields,
+    });
+</script>
diff --git a/src/views/pay/merchant/form/index.vue b/src/views/pay/merchant/form/index.vue
new file mode 100644
index 0000000..65e0eb5
--- /dev/null
+++ b/src/views/pay/merchant/form/index.vue
@@ -0,0 +1,124 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-04 16:42:21
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-06 11:08:35
+ * @Description: file content
+-->
+<template>
+    <div>
+        <el-form ref="formEl" label-width="160px" :model="form" :rules="rules">
+            <el-form-item label="商户平台" prop="mchCode">
+                <el-radio-group v-model="form.mchCode" :disabled="idEdit">
+                    <el-radio v-for="item in opts.platform" :key="item.code" :label="item.code" border>
+                        {{ item.text }}
+                    </el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="商户名称" prop="mchName">
+                <el-input v-model="form.mchName" maxlength="64" show-word-limit />
+            </el-form-item>
+            <el-form-item label="商户ID" prop="mchId">
+                <el-input v-model="form.mchId" maxlength="64" show-word-limit />
+            </el-form-item>
+            <el-form-item label="商户状态" prop="disabled">
+                <el-select v-model="form.isDisabled" :clearable="false">
+                    <el-option v-for="item in opts.status" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <Ali v-if="form.mchCode === 'alipay'" ref="aliFormEl" v-model="form.aliMchData" :detai="aliMchData" />
+            <Wx v-if="form.mchCode === 'wxpay'" v-model="form.wxMchData" ref="wxFormEl" />
+            <el-form-item>
+                <el-button @click="handleCancel">取消</el-button>
+                <el-button :disabled="loading" :loading="submitting" type="primary" @click="handleSave">保存</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script setup lang="jsx">
+    import Ali from './ali.vue';
+    import Wx from './wx.vue';
+    const store = useStore();
+    const router = useRouter();
+    const route = useRoute();
+    // 页面字典表数据
+    const opts = computed(() => store.state.merchant.opts);
+    const defaultForm = {
+        isDisabled: false,
+        mchCode: route.params.id ? '' : 'wxpay',
+        mchName: '',
+        mchId: '',
+        aliMchData: {},
+        wxMchData: {},
+    };
+    const form = reactive({ ...defaultForm });
+    const rules = reactive({
+        mchName: [{ required: true, message: '商户名称不能为空' }],
+        mchId: [{ required: true, message: '商户ID不能为空' }],
+    });
+    const idEdit = computed(() => Boolean(route.params.id));
+
+    const formEl = ref();
+    const aliFormEl = ref();
+    const wxFormEl = ref();
+
+    store.dispatch('merchant/getMerchantPlatform');
+    onActivated(() => {
+        handlelLoadData();
+    });
+    /**
+     * 如果是编辑需要加载初始数据加载
+     */
+    const handlelLoadData = async () => {
+        let id = route.params.id;
+        if (id && form.id !== id) {
+            let res = await store.dispatch('merchant/detail', id);
+            if (res.mchCode === 'alipay') {
+                const publicKey = res.aliMchData.publicKey;
+                if (publicKey) {
+                    res.aliMchData.hasPublicKey = publicKey;
+                    delete res.aliMchData.publicKey;
+                }
+            } else {
+                const { apiKey, apiKeyV3, serialNo } = res.wxMchData;
+                res.wxMchData.hasApiKey = apiKey;
+                delete res.wxMchData.apiKey;
+                res.wxMchData.hasApiKeyV3 = apiKeyV3;
+                delete res.wxMchData.apiKeyV3;
+                res.wxMchData.hasSerialNo = serialNo;
+                delete res.wxMchData.serialNo;
+            }
+            Object.assign(form, res);
+        }
+    };
+    const handleSave = async () => {
+        let validate = false;
+        if (form.mchCode === 'wxpay') {
+            validate = wxFormEl.value.validate;
+        } else {
+            validate = aliFormEl.value.validate;
+        }
+        Promise.all([formEl.value.validate(), validate()])
+            .then(async () => {
+                const res = await store.dispatch('merchant/save', form);
+                if (res) {
+                    handleCancel();
+                }
+            })
+            .catch(() => {});
+    };
+    const handleCancel = () => {
+        Object.assign(form, defaultForm);
+        wxFormEl.value && wxFormEl.value.resetFields();
+        aliFormEl.value && aliFormEl.value.resetFields();
+        formEl.value.resetFields();
+        router.push({ name: 'PayMerchant' });
+    };
+</script>
+<style lang="less" scoped>
+    .form-container {
+        .el-form {
+            // width: 100%;
+        }
+    }
+</style>
diff --git a/src/views/pay/merchant/form/wx.vue b/src/views/pay/merchant/form/wx.vue
new file mode 100644
index 0000000..4211768
--- /dev/null
+++ b/src/views/pay/merchant/form/wx.vue
@@ -0,0 +1,182 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-04 17:57:45
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-06 11:18:45
+ * @Description: file content
+-->
+<template>
+    <el-form labelWidth="160px" ref="formEl" :rules="rules" :model="form">
+        <el-form-item label="API秘钥" prop="apiKey">
+            <el-input
+                maxlength="64"
+                show-word-limit
+                v-model="form.apiKey"
+                :placeholder="modelValue.hasApiKey || '请输入'"
+            />
+        </el-form-item>
+        <el-form-item label="v3秘钥" prop="apiKeyV3">
+            <el-input maxlength="64" show-word-limit v-model="form.apiKeyV3" :placeholder="modelValue.hasApiKeyV3" />
+        </el-form-item>
+        <el-form-item label="证书序列号" prop="serialNo">
+            <el-input maxlength="64" show-word-limit v-model="form.serialNo" :placeholder="modelValue.hasSerialNo" />
+        </el-form-item>
+        <el-form-item label="私钥证书(key.pem)" prop="keyOssUrl">
+            <el-upload action="none" accept=".pem" :show-file-list="false" :http-request="handleUploadKeyCert">
+                <el-button type="success" v-if="modelValue.hasKey || form.keyOssUrl">已上传，点击重新上传</el-button>
+                <el-button type="primary" v-else>上传</el-button>
+            </el-upload>
+        </el-form-item>
+        <el-form-item label="商户证书(key.pem)" prop="certOssUrl">
+            <el-upload action="none" accept=".pem" :show-file-list="false" :http-request="handleUploadCert">
+                <el-button type="success" v-if="modelValue.hasCert || form.certOssUrl">已上传，点击重新上传</el-button>
+                <el-button type="primary" v-else>上传</el-button>
+            </el-upload>
+        </el-form-item>
+        <el-form-item label="p12证书(cert.p12)" prop="certP12OssUrl">
+            <el-upload action="none" accept=".p12" :show-file-list="false" :http-request="handleUploadCert120">
+                <el-button type="success" v-if="modelValue.hasCertP12 || form.certP12OssUrl">
+                    已上传，点击重新上传
+                </el-button>
+                <el-button type="primary" v-else>上传</el-button>
+            </el-upload>
+        </el-form-item>
+    </el-form>
+</template>
+<script setup lang="jsx">
+    import { upload } from '@/api/file';
+    const route = useRoute();
+    const emits = defineEmits(['update:modelValue']);
+    const attrs = useAttrs();
+    const createRules = {
+        apiKey: [{ required: true, message: 'API秘钥不能为空' }],
+        apiKeyV3: [{ required: true, message: 'v3秘钥不能为空' }],
+        serialNo: [{ required: true, message: '证书序列号不能为空' }],
+        certOssUrl: [{ required: true, message: '请上传根商户证书' }],
+        keyOssUrl: [{ required: true, message: '请上传私钥证书' }],
+        certP12OssUrl: [{ required: true, message: '请上传p12证书' }],
+    };
+    const editRules = {
+        apiKey: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasApiKey) {
+                        cb(new Error('API秘钥不能为空'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        apiKeyV3: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasApiKeyV3) {
+                        cb(new Error('v3秘钥不能为空'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        serialNo: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasSerialNo) {
+                        cb(new Error('证书序列号不能为空'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        certOssUrl: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasCert) {
+                        cb(new Error('请上传根商户证书'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        keyOssUrl: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasKey) {
+                        cb(new Error('请上传私钥证书'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+        certP12OssUrl: [
+            {
+                validator: (rule, val, cb) => {
+                    if (!val && !modelValue.value.hasCertP12) {
+                        cb(new Error('请上传p12证书'));
+                    } else {
+                        cb();
+                    }
+                },
+            },
+        ],
+    };
+    const form = reactive({
+        apiKey: '',
+        apiKeyV3: '',
+        serialNo: '',
+        certOssUrl: '',
+        keyOssUrl: '',
+        certP12OssUrl: '',
+    });
+    const rules = computed(() => {
+        return route.name === 'UpdateMerchant' ? editRules : createRules;
+    });
+    const modelValue = computed(() => attrs.modelValue);
+    const formEl = ref();
+
+    watch(
+        () => toRefs(form),
+        () => {
+            emits('update:modelValue', Object.assign(unref(modelValue), form));
+        }
+    );
+
+    /**
+     * 上传公钥证书
+     */
+    const handleUploadCert = async ({ file }) => {
+        const res = await upload('payCenter', 'merchant/', file);
+        form.certOssUrl = res;
+    };
+    /**
+     * 上传私钥证书
+     */
+    const handleUploadKeyCert = async ({ file }) => {
+        const res = await upload('payCenter', 'merchant/', file);
+        form.keyOssUrl = res;
+    };
+    /**
+     * 上传p12证书
+     */
+    const handleUploadCert120 = async ({ file }) => {
+        const res = await upload('payCenter', 'merchant/', file);
+        form.certP12OssUrl = res;
+    };
+    /**
+     * 验证方法暴露给父组件
+     */
+    const validate = async () => {
+        await formEl.value.validate();
+    };
+    const resetFields = () => {
+        formEl.value.resetFields();
+    };
+    defineExpose({
+        validate,
+        resetFields,
+    });
+</script>
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
index f3ada3b..70dab01 100644
--- a/src/views/pay/merchant/index.vue
+++ b/src/views/pay/merchant/index.vue
@@ -2,60 +2,53 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-04 11:38:11
+ * @LastEditTime: 2022-07-06 11:19:31
  * @Description: file content
 -->
 <template>
-    <div>
-        <table-list
-            v-loading="loading"
-            :operation="['search']"
-            :code="_pagingCode"
-            :config="config"
-            :data="list"
-            :total="total"
-            @search="handleSearch"
-            :reset="handleReset"
-        >
-            <template #search>
-                <el-form inline>
-                    <el-form-item label="商户平台" prop="productName">
-                        <el-input v-model="state.condition.productName" />
-                    </el-form-item>
-                    <el-form-item label="商户名称">
-                        <el-input v-model="state.condition.userName" />
-                    </el-form-item>
-                    <el-form-item label="商户ID" prop="phone">
-                        <el-input v-model="state.condition.phone" />
-                    </el-form-item>
-                    <el-form-item label="商户状态" prop="status">
-                        <el-select v-model="state.condition.isShow">
-                            <el-option
-                                v-for="(item, idx) in opts.isShow"
-                                :key="idx"
-                                :label="item.label"
-                                :value="item.value"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-            </template>
-
-            <template #operation="{ selection }">
-                <div class="batch-show-hide" v-if="selection.length">
-                    <el-select v-model="allShowHideVal">
+    <table-list
+        v-loading="loading"
+        :code="code"
+        :config="config"
+        :data="list"
+        :operation="['create', 'search']"
+        :reset="handleReset"
+        title="商户"
+        :total="total"
+        @create="handleCreate"
+        @search="handleSearch"
+    >
+        <template #search>
+            <el-form inline>
+                <el-form-item label="商户名称">
+                    <el-input v-model="state.condition.mchName" />
+                </el-form-item>
+                <el-form-item label="商户ID">
+                    <el-input v-model="state.condition.mchId" />
+                </el-form-item>
+                <el-form-item label="商户平台">
+                    <el-select v-model="state.condition.mchCode">
+                        <el-option
+                            v-for="(item, idx) in opts.platform"
+                            :key="idx"
+                            :label="item.text"
+                            :value="item.code"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="商户状态">
+                    <el-select v-model="state.condition.isDisabled">
                         <el-option
-                            v-for="(item, idx) in opts.isShow"
+                            v-for="(item, idx) in opts.status"
                             :key="idx"
                             :label="item.label"
                             :value="item.value"
-                        ></el-option>
+                        />
                     </el-select>
-                    <el-button type="primary" @click="handleAllShowHide(selection)">确定</el-button>
-                </div>
-            </template>
-        </table-list>
-    </div>
+                </el-form-item>
+            </el-form>
+        </template>
+    </table-list>
 </template>
 <script setup lang="jsx">
     import ElButton from '@/components/extra/ElButton.vue';
@@ -64,37 +57,32 @@
     const store = useStore();
     const loading = ref(false);
     // 页面字典表数据
-    const opts = computed(() => store.state.comment.opts);
+    const opts = computed(() => store.state.merchant.opts);
     // 表格数据
-    const list = computed(() => _.cloneDeep(store.state.comment.list));
-    const total = computed(() => store.state.comment.total);
-    // 分页code需要使用此code到全局sotre取分页参数
-    const _pagingCode = 'CommentManagement';
+    const code = computed(() => store.state.merchant.code);
+    const list = computed(() => _.cloneDeep(store.state.merchant.list));
+    const total = computed(() => store.state.merchant.total);
     // 表格查询参数
     const _condition = {
-        productName: '',
-        userName: '',
-        phone: '',
-        scoreList: [],
-        isShow: '',
-        dateRange: '',
+        mchCode: '',
+        mchId: '',
+        mchName: '',
+        isDisabled: null,
     };
     const state = reactive({
         condition: { ..._condition },
     });
-    // 批量操作的值
-    const allShowHideVal = ref(true);
-
-    // store.dispatch('comment/search', { pagingCode: _pagingCode });
 
     /**
      * 搜索
      */
     const handleSearch = async () => {
         loading.value = true;
-        await store.dispatch('comment/search', { ...state.condition, pagingCode: _pagingCode });
+        await store.dispatch('merchant/search', { ...state.condition });
         loading.value = false;
     };
+
+    store.dispatch('merchant/getMerchantPlatform');
     onActivated(handleSearch);
     /**
      * 重置
@@ -102,121 +90,68 @@
     const handleReset = () => {
         state.condition = { ..._condition };
     };
-    /**
-     * 单行操作显示隐藏
-     *
-     */
-    const handleShowHide = async (row) => {
-        loading.value = true;
-        try {
-            await store.dispatch('comment/updateShow', {
-                idList: [row.id],
-                isShow: row.isShow,
-            });
-        } catch (e) {
-            row.isShow = !row.isShow;
-        }
-        loading.value = false;
+    const handleCreate = () => {
+        router.push('./create');
     };
-    /**
-     * 批量操作显示隐藏
-     */
-    const handleAllShowHide = async (selection) => {
-        loading.value = true;
-        let val = allShowHideVal.value;
-        try {
-            await store.dispatch('comment/updateShow', {
-                idList: selection.map((i) => i.id),
-                isShow: val,
-            });
-        } catch (e) {
-            val = !val;
-        }
-        loading.value = false;
-        selection.forEach((item) => {
-            item.isShow = val;
+    const handleShowHide = (row) => {
+        store.dispatch('merchant/updateStatus', {
+            mchPrimaryId: row.mchPrimaryId,
+            isDisabled: !row.isShow,
         });
     };
     const handleDetail = (id) => {
         router.push({
-            name: 'CommentDetail',
+            name: 'UpdateMerchant',
             params: {
-                id: id,
+                id,
             },
         });
     };
-
+    const handleDelete = (id) => {
+        store.dispatch('merchant/del', id);
+    };
     const config = reactive({
         columns: [
             {
-                type: 'selection',
-                fixed: 'left',
-                width: 60,
-            },
-            {
-                label: '商品名称',
-                width: 180,
+                label: '商户名称',
                 align: 'left',
-                slots: {
-                    default: ({ row }) => <div class="row-ellipsis">{row.productName}</div>,
-                },
+                prop: 'mchName',
             },
             {
-                label: '评价内容',
+                label: '商户ID',
                 align: 'left',
-                slots: {
-                    default: ({ row }) => (
-                        <div class="row-ellipsis ctx-link" onClick={() => handleDetail(row.id)}>
-                            {row.commentContent}
-                        </div>
-                    ),
-                },
-            },
-            {
-                label: '评分',
-                prop: 'scoreName',
-                width: 70,
-            },
-            {
-                label: '用户',
-                width: 120,
-                slots: {
-                    default: ({ row }) => (
-                        <div>
-                            <p class="row-ellipsis">{row.userName}</p>
-                            <p>{row.phone}</p>
-                        </div>
-                    ),
-                },
+                prop: 'mchId',
             },
             {
-                label: '评价时间',
-                prop: 'time',
+                label: '商户平台',
                 width: 120,
-                slots: {
-                    default: ({ row }) => (
-                        <div>
-                            <p>{row.createTime.split(' ')[0]}</p>
-                            <p>{row.createTime.split(' ')[1]}</p>
-                        </div>
-                    ),
-                },
+                prop: 'mchCode',
             },
             {
-                label: '显示',
+                label: '状态',
                 width: 80,
                 slots: {
                     default: ({ row }) => <ElSwitch v-model={row.isShow} onChange={() => handleShowHide(row)} />,
                 },
             },
+            {
+                label: '创建时间',
+                prop: 'createTime',
+                width: 160,
+            },
             {
                 label: '操作',
-                width: 70,
+                width: 120,
                 slots: {
                     default: ({ row }) => (
-                        <ElButton type="text" onClick={() => handleDetail(row.id)}>
-                            查看
-                        </ElButton>
+                        <div>
+                            <ElButton type="text" onClick={() => handleDetail(row.mchPrimaryId)}>
+                                编辑
+                            </ElButton>
+                            <ElButton type="text" onClick={() => handleDelete(row.mchPrimaryId)}>
+                                删除
+                            </ElButton>
+                        </div>
                     ),
                 },
             },
diff --git a/vite.config.js b/vite.config.js
index 1d71253..f4edbee 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -90,7 +90,7 @@ export default (configEnv) => {
             {
                 ...eslintPlugin({
                     eslintOptions: {
-                        cache: true,
+                        cache: false,
                     },
                     shouldLint: (path) => /\/src\/[^?]*\.(vue|m?[jt]sx?)$/.test(path),
                 }),

From 2be7fceb7b43467d3725cd5aee08cc31ef950fe9 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 6 Jul 2022 14:35:01 +0800
Subject: [PATCH 03/15] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/application.js           |  54 ++++++++++++
 src/api/pay/merchant.js              |   8 +-
 src/store/modules/pay/application.js | 112 ++++++++++++++++++++++++
 src/store/modules/pay/merchant.js    |   2 +-
 src/views/pay/application/index.vue  | 125 +++++++++++++++++++--------
 src/views/pay/merchant/index.vue     |   4 +-
 6 files changed, 263 insertions(+), 42 deletions(-)
 create mode 100644 src/api/pay/application.js
 create mode 100644 src/store/modules/pay/application.js

diff --git a/src/api/pay/application.js b/src/api/pay/application.js
new file mode 100644
index 0000000..5aee88d
--- /dev/null
+++ b/src/api/pay/application.js
@@ -0,0 +1,54 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:20:02
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-06 14:27:54
+ * @Description: file content
+ */
+import request from '@/utils/request.js';
+export const create = (data) => {
+    return request({
+        url: '/payCenter/mchInfo',
+        method: 'post',
+        data,
+    });
+};
+export const del = (mchPrimaryId) => {
+    return request({
+        url: `/payCenter/mchInfo/${mchPrimaryId}`,
+        method: 'delete',
+    });
+};
+export const detail = (mchPrimaryId) => {
+    return request({
+        url: `/payCenter/mchInfo/${mchPrimaryId}`,
+        method: 'get',
+    });
+};
+export const update = (data) => {
+    return request({
+        url: '/payCenter/mchInfo',
+        method: 'put',
+        data,
+    });
+};
+export const updateStatus = (params) => {
+    return request({
+        url: `/payCenter/appInfo/updateStatus`,
+        method: 'put',
+        params,
+    });
+};
+export const getApplicationList = (params) => {
+    return request({
+        url: '/payCenter/appInfo/page',
+        method: 'get',
+        params,
+    });
+};
+export const getPayType = () => {
+    return request({
+        url: '/payCenter/appInfo/payCode',
+        method: 'get',
+    });
+};
diff --git a/src/api/pay/merchant.js b/src/api/pay/merchant.js
index 72b140e..b857ba5 100644
--- a/src/api/pay/merchant.js
+++ b/src/api/pay/merchant.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 10:09:07
+ * @LastEditTime: 2022-07-06 14:14:31
  * @Description: file content
  */
 import request from '@/utils/request.js';
@@ -46,6 +46,12 @@ export const getMerchantList = (params) => {
         params,
     });
 };
+export const getMerchantSelector = () => {
+    return request({
+        url: '/payCenter/mchInfo/mchSelector',
+        method: 'get',
+    });
+};
 export const getMerchantPlatform = (params) => {
     return request({
         url: '/payCenter/mchInfo/mchCode',
diff --git a/src/store/modules/pay/application.js b/src/store/modules/pay/application.js
new file mode 100644
index 0000000..6e33dfe
--- /dev/null
+++ b/src/store/modules/pay/application.js
@@ -0,0 +1,112 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:21:30
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-06 14:31:27
+ * @Description: file content
+ */
+import * as api from '@/api/pay/application.js';
+import * as mchApi from '@/api/pay/merchant.js';
+import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
+const state = {
+    code: 'PayApplicationManagement',
+    list: [],
+    detail: {},
+    total: 0,
+    opts: {
+        status: [
+            {
+                value: false,
+                label: '启用',
+            },
+            {
+                value: true,
+                label: '禁用',
+            },
+        ],
+        merchant: [],
+        payType: [],
+    },
+};
+const getters = {};
+const mutations = {
+    setList: (state, data) => (state.list = data),
+    setPayType: (state, data) => (state.opts.payType = data),
+    setMerchant: (state, data) => (state.opts.merchant = data),
+    setTotal: (state, data) => (state.total = data),
+    setDetail: (state, data) => (state.detail = data),
+};
+const actions = {
+    async search({ rootGetters, commit }, params) {
+        const res = await api.getApplicationList({
+            ...rootGetters['local/page'](state.code),
+            ...params,
+        });
+        if (res) {
+            commit('setList', res?.records.map((i) => ({ ...i, isShow: !i.isDisabled })) || []);
+            commit('setTotal', res?.total || 0);
+        }
+    },
+    async save({ dispatch }, data) {
+        let save = data.mchPrimaryId ? api.update : api.create;
+        let res = await save(data);
+        if (res) {
+            ElMessage.success('保存成功');
+            dispatch('search');
+        } else {
+            ElMessage.error('保存失败');
+        }
+        return res;
+    },
+    detail: async (context, id) => {
+        let res = await api.detail(id);
+        if (!res) {
+            ElMessage.error('加载详情失败');
+        }
+        return res;
+    },
+    del: async ({ dispatch }, id) => {
+        try {
+            await ElMessageBox.confirm('数据删除后无法恢复，确定要删除吗?', '危险操作');
+            let res = await api.del(id);
+            if (res) {
+                ElMessage.success('删除成功');
+                dispatch('search');
+            } else {
+                ElMessage.error('删除失败');
+            }
+            return res;
+        } catch (e) {
+            console.info('取消删除', e);
+        }
+    },
+    async updateStatus({ dispatch }, data) {
+        let res = await api.updateStatus(data);
+        if (res) {
+            ElMessage.success('保存成功');
+            dispatch('search');
+        } else {
+            ElMessage.error('保存失败');
+        }
+        return res;
+    },
+    async getMerchantList({ commit }) {
+        const res = await mchApi.getMerchantSelector();
+        if (res) {
+            commit('setMerchant', res || []);
+        }
+    },
+    async getPayType({ commit }) {
+        const res = await api.getPayType();
+        if (res) {
+            commit('setPayType', res || []);
+        }
+    },
+};
+
+export default {
+    state,
+    getters,
+    mutations,
+    actions,
+};
diff --git a/src/store/modules/pay/merchant.js b/src/store/modules/pay/merchant.js
index 6449959..be58c41 100644
--- a/src/store/modules/pay/merchant.js
+++ b/src/store/modules/pay/merchant.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 15:21:30
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 11:16:50
+ * @LastEditTime: 2022-07-06 11:26:06
  * @Description: file content
  */
 import * as api from '@/api/pay/merchant.js';
diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
index c66affc..0186278 100644
--- a/src/views/pay/application/index.vue
+++ b/src/views/pay/application/index.vue
@@ -2,38 +2,48 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-04 16:56:20
+ * @LastEditTime: 2022-07-06 14:31:59
  * @Description: file content
 -->
 <template>
     <table-list
         v-loading="loading"
-        :operation="['search']"
-        :code="_pagingCode"
+        :code="code"
         :config="config"
         :data="list"
-        :total="total"
+        :operation="['create', 'search']"
+        :reset="handleReset"
         title="商户"
+        :total="total"
+        @create="handleCreate"
         @search="handleSearch"
-        @create="handleCreate()"
-        :reset="handleReset"
     >
         <template #search>
             <el-form inline>
-                <el-form-item label="商户名称">
-                    <el-input v-model="state.condition.mchName" />
+                <el-form-item label="所属商户">
+                    <el-select v-model="state.condition.mchPrimaryId">
+                        <el-option
+                            v-for="item in opts.merchant"
+                            :key="item.mchPrimaryId"
+                            :label="item.mchName"
+                            :value="item.mchPrimaryId"
+                        />
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="商户ID">
-                    <el-input v-model="state.condition.mchId" />
+                <el-form-item label="应用名称">
+                    <el-input v-model="state.condition.appName" />
                 </el-form-item>
-                <el-form-item label="商户平台">
-                    <el-select v-model="state.condition.mchCode">
+                <el-form-item label="应用ID">
+                    <el-input v-model="state.condition.appId" />
+                </el-form-item>
+                <el-form-item label="支付方式">
+                    <el-select v-model="state.condition.payCode">
                         <el-option
-                            v-for="(item, idx) in opts.platform"
+                            v-for="(item, idx) in opts.payType"
                             :key="idx"
                             :label="item.text"
                             :value="item.code"
-                        ></el-option>
+                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商户状态">
@@ -43,7 +53,7 @@
                             :key="idx"
                             :label="item.label"
                             :value="item.value"
-                        ></el-option>
+                        />
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -57,17 +67,17 @@
     const store = useStore();
     const loading = ref(false);
     // 页面字典表数据
-    const opts = computed(() => store.state.merchant.opts);
+    const opts = computed(() => store.state.application.opts);
     // 表格数据
-    const list = computed(() => _.cloneDeep(store.state.merchant.list));
-    const total = computed(() => store.state.merchant.total);
-    // 分页code需要使用此code到全局sotre取分页参数
-    const _pagingCode = 'PayMerchantManagement';
+    const code = computed(() => store.state.application.code);
+    const list = computed(() => _.cloneDeep(store.state.application.list));
+    const total = computed(() => store.state.application.total);
     // 表格查询参数
     const _condition = {
-        mchCode: '',
-        mchId: '',
-        mchName: '',
+        mchPrimaryId: '',
+        payCode: '',
+        appId: '',
+        appName: '',
         isDisabled: null,
     };
     const state = reactive({
@@ -79,11 +89,12 @@
      */
     const handleSearch = async () => {
         loading.value = true;
-        await store.dispatch('merchant/search', { ...state.condition, pagingCode: _pagingCode });
+        await store.dispatch('application/search', { ...state.condition });
         loading.value = false;
     };
 
-    store.dispatch('merchant/getMerchantPlatform');
+    store.dispatch('application/getMerchantList');
+    store.dispatch('application/getPayType');
     onActivated(handleSearch);
     /**
      * 重置
@@ -91,28 +102,61 @@
     const handleReset = () => {
         state.condition = { ..._condition };
     };
-    const handleCreate = () => {};
+    const handleCreate = () => {
+        router.push('./create');
+    };
+    const handleShowHide = (row) => {
+        store.dispatch('application/updateStatus', {
+            appPrimaryId: row.appPrimaryId,
+            isDisabled: !row.isShow,
+        });
+    };
+    const handleEdit = (id) => {
+        router.push({
+            path: './update',
+            params: {
+                id,
+            },
+        });
+    };
+    const handleDelete = (id) => {
+        store.dispatch('application/del', id);
+    };
     const config = reactive({
         columns: [
             {
-                label: '商户名称',
+                label: '应用名称',
+                align: 'left',
+                prop: 'appName',
+            },
+            {
+                label: '应用代号',
                 align: 'left',
-                prop: 'mchName',
+                prop: 'appCode',
             },
             {
-                label: '商户ID',
+                label: '应用ID',
                 align: 'left',
-                prop: 'mchId',
+                prop: 'appId',
             },
             {
-                label: '商户平台',
+                label: '所属商户',
                 width: 120,
-                prop: 'mchCode',
+                slots: {
+                    default: ({ row }) => <span>{row.mchInfo.mchName}</span>,
+                },
             },
             {
-                label: '商户状态',
+                label: '支付方式',
                 width: 120,
-                prop: 'isDisabledDesc',
+                prop: 'payCodes',
+            },
+            {
+                label: '状态',
+                width: 80,
+                slots: {
+                    default: ({ row }) => <ElSwitch v-model={row.isShow} onChange={() => handleShowHide(row)} />,
+                },
             },
             {
                 label: '创建时间',
@@ -121,12 +165,17 @@
             },
             {
                 label: '操作',
-                width: 70,
+                width: 120,
                 slots: {
                     default: ({ row }) => (
-                        <ElButton type="text" onClick={() => handleDetail(row.id)}>
-                            查看
-                        </ElButton>
+                        <div>
+                            <ElButton type="text" onClick={() => handleEdit(row.mchPrimaryId)}>
+                                编辑
+                            </ElButton>
+                            <ElButton type="text" onClick={() => handleDelete(row.mchPrimaryId)}>
+                                删除
+                            </ElButton>
+                        </div>
                     ),
                 },
             },
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
index 70dab01..8b6474c 100644
--- a/src/views/pay/merchant/index.vue
+++ b/src/views/pay/merchant/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 11:19:31
+ * @LastEditTime: 2022-07-06 14:34:01
  * @Description: file content
 -->
 <template>
@@ -125,7 +125,7 @@
             {
                 label: '商户平台',
                 width: 120,
-                prop: 'mchCode',
+                prop: 'mchCodeText',
             },
             {
                 label: '状态',

From 7c9a5aa77eb4d537561ce074921616621400c80e Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 6 Jul 2022 19:08:41 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/application.js           |  10 +-
 src/store/modules/pay/application.js |   4 +-
 src/views/pay/application/add.vue    |  11 --
 src/views/pay/application/detail.vue |  11 --
 src/views/pay/application/form.vue   | 199 +++++++++++++++++++++++++++
 src/views/pay/application/index.vue  |  12 +-
 6 files changed, 212 insertions(+), 35 deletions(-)
 delete mode 100644 src/views/pay/application/add.vue
 delete mode 100644 src/views/pay/application/detail.vue
 create mode 100644 src/views/pay/application/form.vue

diff --git a/src/api/pay/application.js b/src/api/pay/application.js
index 5aee88d..c0b8972 100644
--- a/src/api/pay/application.js
+++ b/src/api/pay/application.js
@@ -2,32 +2,32 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 14:27:54
+ * @LastEditTime: 2022-07-06 17:20:08
  * @Description: file content
  */
 import request from '@/utils/request.js';
 export const create = (data) => {
     return request({
-        url: '/payCenter/mchInfo',
+        url: '/payCenter/appInfo',
         method: 'post',
         data,
     });
 };
 export const del = (mchPrimaryId) => {
     return request({
-        url: `/payCenter/mchInfo/${mchPrimaryId}`,
+        url: `/payCenter/appInfo/${mchPrimaryId}`,
         method: 'delete',
     });
 };
 export const detail = (mchPrimaryId) => {
     return request({
-        url: `/payCenter/mchInfo/${mchPrimaryId}`,
+        url: `/payCenter/appInfo/${mchPrimaryId}`,
         method: 'get',
     });
 };
 export const update = (data) => {
     return request({
-        url: '/payCenter/mchInfo',
+        url: '/payCenter/appInfo',
         method: 'put',
         data,
     });
diff --git a/src/store/modules/pay/application.js b/src/store/modules/pay/application.js
index 6e33dfe..53ad07f 100644
--- a/src/store/modules/pay/application.js
+++ b/src/store/modules/pay/application.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 15:21:30
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 14:31:27
+ * @LastEditTime: 2022-07-06 17:18:37
  * @Description: file content
  */
 import * as api from '@/api/pay/application.js';
@@ -48,7 +48,7 @@ const actions = {
         }
     },
     async save({ dispatch }, data) {
-        let save = data.mchPrimaryId ? api.update : api.create;
+        let save = data.appPrimaryId ? api.update : api.create;
         let res = await save(data);
         if (res) {
             ElMessage.success('保存成功');
diff --git a/src/views/pay/application/add.vue b/src/views/pay/application/add.vue
deleted file mode 100644
index 0563eff..0000000
--- a/src/views/pay/application/add.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-07-04 16:37:25
- * @LastEditors: ch
- * @LastEditTime: 2022-07-04 16:38:00
- * @Description: file content
--->
-<template>
-    <div></div>
-</template>
-<script setup lang="jsx"></script>
diff --git a/src/views/pay/application/detail.vue b/src/views/pay/application/detail.vue
deleted file mode 100644
index d39e58f..0000000
--- a/src/views/pay/application/detail.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-07-04 16:34:07
- * @LastEditors: ch
- * @LastEditTime: 2022-07-04 16:34:13
- * @Description: file content
--->
-<template></template>
-<script lang="jsx">
-    export default {};
-</script>
diff --git a/src/views/pay/application/form.vue b/src/views/pay/application/form.vue
new file mode 100644
index 0000000..412f8c5
--- /dev/null
+++ b/src/views/pay/application/form.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-04 16:42:21
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-06 19:01:37
+ * @Description: file content
+-->
+<template>
+    <div>
+        <el-form ref="formEl" label-width="160px" :model="form" :rules="rules">
+            <el-form-item label="商户平台" prop="mchPrimaryId">
+                <el-select v-model="form.mchPrimaryId" @change="handleChangeMch" :disabled="isEdit">
+                    <el-option
+                        v-for="item in opts.merchant"
+                        :key="item.mchPrimaryId"
+                        :label="item.mchName"
+                        :value="item.mchPrimaryId"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="应用名称" prop="appName">
+                <el-input v-model="form.appName" maxlength="64" show-word-limit />
+            </el-form-item>
+            <el-form-item label="应用代号" prop="appCode">
+                <el-input v-model="form.appCode" maxlength="64" show-word-limit />
+            </el-form-item>
+            <el-form-item label="支付方式" prop="payCodes" v-if="form.mchInfo.mchCode">
+                <el-checkbox-group v-model="form.payCodes">
+                    <el-checkbox v-for="item in payTypeData" :label="item.code" :key="item.code">
+                        {{ item.text }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="应用ID" prop="appId">
+                <el-input v-model="form.appId" maxlength="64" show-word-limit />
+            </el-form-item>
+            <el-form-item label="签名秘钥" prop="signKey">
+                <el-input v-model="form.signKey" maxlength="64" show-word-limit />
+            </el-form-item>
+            <el-form-item label="应用状态">
+                <el-select v-model="form.isDisabled" :clearable="false">
+                    <el-option v-for="item in opts.status" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+
+            <template v-if="form.mchInfo.mchCode === 'wxpay'">
+                <el-form-item label="应用Secret" prop="appSecret">
+                    <el-input
+                        type="textarea"
+                        maxlength="400"
+                        show-word-limit
+                        v-model="form.appSecret"
+                        :placeholder="form.wxAppData.appSecret"
+                    />
+                </el-form-item>
+            </template>
+            <template v-if="form.mchInfo.mchCode === 'alipay'">
+                <el-form-item label="应用私钥" prop="privateKey">
+                    <el-input
+                        type="textarea"
+                        maxlength="400"
+                        show-word-limit
+                        v-model="form.privateKey"
+                        :placeholder="form.aliAppData.privateKey"
+                    />
+                </el-form-item>
+                <el-form-item label="应用证书" prop="appCertUrl">
+                    <el-upload action="none" accept=".crt" :show-file-list="false" :http-request="handleUpload">
+                        <el-button type="success" v-if="form.aliAppData.hasAppCert || form.appCertUrl">
+                            已上传，点击重新上传
+                        </el-button>
+                        <el-button type="primary" v-else>上传</el-button>
+                    </el-upload>
+                </el-form-item>
+            </template>
+            <el-form-item>
+                <el-button @click="handleCancel">取消</el-button>
+                <el-button :disabled="loading" :loading="submitting" type="primary" @click="handleSave">保存</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script setup lang="jsx">
+    import { upload } from '@/api/file';
+    const store = useStore();
+    const router = useRouter();
+    const route = useRoute();
+    // 页面字典表数据
+    const opts = computed(() => store.state.application.opts);
+    const defaultForm = {
+        mchInfo: {},
+        mchPrimaryId: '',
+        appName: '',
+        appCode: '',
+        payCodes: [],
+        appId: '',
+        signKey: '',
+        isDisabled: false,
+        aliAppData: {
+            privateKey: '',
+            appCertUrl: '',
+        },
+        wxAppData: {
+            appSecret: '',
+        },
+    };
+    const defaultRules = {
+        mchPrimaryId: [{ required: true, message: '请选择商户平台' }],
+        appName: [{ required: true, message: '应用名称不能为空' }],
+        appCode: [{ required: true, message: '应用代号不能为空' }],
+        payCodes: [{ type: 'array', required: true, message: '至少选一个支付方式' }],
+        appId: [{ required: true, message: '应用ID不能为空' }],
+        signKey: [{ required: true, message: '签名秘钥不能为空' }],
+    };
+    const form = reactive({ ...defaultForm });
+    const isEdit = computed(() => Boolean(route.params.id));
+    const payTypeData = computed(() => {
+        return (
+            unref(opts).payType.filter((i) => {
+                return i.mchCode === form.mchInfo.mchCode;
+            }) || []
+        );
+    });
+    const rules = computed(() => {
+        let meRules = { ...defaultRules };
+        if (!isEdit.value) {
+            meRules.appSecret = [{ required: true, message: '应用Secret不能为空' }];
+            meRules.privateKey = [{ required: true, message: '应用私钥不能为空' }];
+            meRules.appCertUrl = [{ required: true, message: '应用证书不能为空' }];
+        }
+        return meRules;
+    });
+
+    const formEl = ref();
+
+    store.dispatch('application/getMerchantList');
+    store.dispatch('application/getPayType');
+    onActivated(() => {
+        handlelLoadData();
+    });
+    /**
+     * 如果是编辑需要加载初始数据加载
+     */
+    const handlelLoadData = async () => {
+        let id = route.params.id;
+        if (id && form.id !== id) {
+            let res = await store.dispatch('application/detail', id);
+            res.payCodes = res.payCodes.split(',');
+            Object.assign(form, res);
+        }
+    };
+    /**
+     * 切换商户时需要拿到当前商户信息，用来应用判断属于哪个平台
+     */
+    const handleChangeMch = (item) => {
+        if (!item) {
+            return false;
+        }
+        const mchCode = form.mchInfo.mchCode;
+        form.mchInfo = unref(opts).merchant.find((i) => i.mchPrimaryId === item);
+        if (mchCode !== form.mchInfo.mchCode) {
+            form.payCodes = [];
+        }
+    };
+
+    /**
+     * 上传阿里应用证书
+     */
+    const handleUpload = async ({ file }) => {
+        const res = await upload('payCenter', 'application/', file);
+        form.appCertUrl = res;
+    };
+    const handleSave = async () => {
+        try {
+            await formEl.value.validate();
+            let data = { ...form };
+            data.payCodes = data.payCodes.join(',');
+            if (data.privateKey) {
+                data.aliAppData.privateKey = data.privateKey;
+            }
+            if (data.appCertUrl) {
+                data.aliAppData.appCertUrl = data.appCertUrl;
+            }
+            if (data.appSecret) {
+                data.wxAppData.appSecret = data.appSecret;
+            }
+            const res = await store.dispatch('application/save', data);
+            if (res) {
+                handleCancel();
+            }
+        } catch (e) {}
+    };
+    const handleCancel = () => {
+        Object.assign(form, defaultForm);
+        formEl.value.resetFields();
+        router.push({ name: 'PayApplication' });
+    };
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
index 0186278..eb21c8b 100644
--- a/src/views/pay/application/index.vue
+++ b/src/views/pay/application/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 14:31:59
+ * @LastEditTime: 2022-07-06 16:46:56
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,7 @@
         :data="list"
         :operation="['create', 'search']"
         :reset="handleReset"
-        title="商户"
+        title="应用"
         :total="total"
         @create="handleCreate"
         @search="handleSearch"
@@ -103,7 +103,7 @@
         state.condition = { ..._condition };
     };
     const handleCreate = () => {
-        router.push('./create');
+        router.push({ name: 'CreateApplication' });
     };
     const handleShowHide = (row) => {
         store.dispatch('application/updateStatus', {
@@ -113,7 +113,7 @@
     };
     const handleEdit = (id) => {
         router.push({
-            path: './update',
+            name: 'UpdateApplication',
             params: {
                 id,
             },
@@ -169,10 +169,10 @@
                 slots: {
                     default: ({ row }) => (
                         <div>
-                            <ElButton type="text" onClick={() => handleEdit(row.mchPrimaryId)}>
+                            <ElButton type="text" onClick={() => handleEdit(row.appPrimaryId)}>
                                 编辑
                             </ElButton>
-                            <ElButton type="text" onClick={() => handleDelete(row.mchPrimaryId)}>
+                            <ElButton type="text" onClick={() => handleDelete(row.appPrimaryId)}>
                                 删除
                             </ElButton>
                         </div>

From 508c8526ac28ab81f5b4681e30712154bbc8a075 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 7 Jul 2022 10:01:25 +0800
Subject: [PATCH 05/15] =?UTF-8?q?pref:=20=E4=BF=AE=E6=94=B9=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goods/comment/{detail/index.vue => detail.vue} | 0
 src/views/goods/comment/{list/index.vue => list.vue}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/views/goods/comment/{detail/index.vue => detail.vue} (100%)
 rename src/views/goods/comment/{list/index.vue => list.vue} (100%)

diff --git a/src/views/goods/comment/detail/index.vue b/src/views/goods/comment/detail.vue
similarity index 100%
rename from src/views/goods/comment/detail/index.vue
rename to src/views/goods/comment/detail.vue
diff --git a/src/views/goods/comment/list/index.vue b/src/views/goods/comment/list.vue
similarity index 100%
rename from src/views/goods/comment/list/index.vue
rename to src/views/goods/comment/list.vue

From 49499deb60b5837b45ff0525402926850545cbb2 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 7 Jul 2022 14:11:19 +0800
Subject: [PATCH 06/15] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/application.js           |  11 +-
 src/api/pay/merchant.js              |   4 +-
 src/api/pay/payOrder.js              |  21 +++
 src/api/pay/refundOrder.js           |  21 +++
 src/store/modules/pay/payOrder.js    | 115 ++++++++++++++
 src/store/modules/pay/refundOrder.js | 107 +++++++++++++
 src/views/pay/payOrder/list.vue      | 229 +++++++++++++++++++++++++++
 src/views/pay/refundOrder/list.vue   | 227 ++++++++++++++++++++++++++
 8 files changed, 731 insertions(+), 4 deletions(-)
 create mode 100644 src/api/pay/payOrder.js
 create mode 100644 src/api/pay/refundOrder.js
 create mode 100644 src/store/modules/pay/payOrder.js
 create mode 100644 src/store/modules/pay/refundOrder.js
 create mode 100644 src/views/pay/payOrder/list.vue
 create mode 100644 src/views/pay/refundOrder/list.vue

diff --git a/src/api/pay/application.js b/src/api/pay/application.js
index c0b8972..9b071af 100644
--- a/src/api/pay/application.js
+++ b/src/api/pay/application.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 17:20:08
+ * @LastEditTime: 2022-07-07 11:06:40
  * @Description: file content
  */
 import request from '@/utils/request.js';
@@ -34,7 +34,7 @@ export const update = (data) => {
 };
 export const updateStatus = (params) => {
     return request({
-        url: `/payCenter/appInfo/updateStatus`,
+        url: '/payCenter/appInfo/updateStatus',
         method: 'put',
         params,
     });
@@ -46,6 +46,13 @@ export const getApplicationList = (params) => {
         params,
     });
 };
+export const getApplicationSelector = (params) => {
+    return request({
+        url: '/payCenter/appInfo/appSelector',
+        method: 'get',
+        params,
+    });
+};
 export const getPayType = () => {
     return request({
         url: '/payCenter/appInfo/payCode',
diff --git a/src/api/pay/merchant.js b/src/api/pay/merchant.js
index b857ba5..6628ee0 100644
--- a/src/api/pay/merchant.js
+++ b/src/api/pay/merchant.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 14:14:31
+ * @LastEditTime: 2022-07-07 10:10:21
  * @Description: file content
  */
 import request from '@/utils/request.js';
@@ -34,7 +34,7 @@ export const update = (data) => {
 };
 export const updateStatus = (params) => {
     return request({
-        url: `/payCenter/mchInfo/updateStatus`,
+        url: '/payCenter/mchInfo/updateStatus',
         method: 'put',
         params,
     });
diff --git a/src/api/pay/payOrder.js b/src/api/pay/payOrder.js
new file mode 100644
index 0000000..14cdefa
--- /dev/null
+++ b/src/api/pay/payOrder.js
@@ -0,0 +1,21 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:20:02
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 11:37:32
+ * @Description: file content
+ */
+import request from '@/utils/request.js';
+export const detail = (mchPrimaryId) => {
+    return request({
+        url: `/payCenter/appInfo/${mchPrimaryId}`,
+        method: 'get',
+    });
+};
+export const getOrderList = (params) => {
+    return request({
+        url: '/payCenter/payOrder/page',
+        method: 'get',
+        params,
+    });
+};
diff --git a/src/api/pay/refundOrder.js b/src/api/pay/refundOrder.js
new file mode 100644
index 0000000..8ae372f
--- /dev/null
+++ b/src/api/pay/refundOrder.js
@@ -0,0 +1,21 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:20:02
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 11:37:26
+ * @Description: file content
+ */
+import request from '@/utils/request.js';
+export const detail = (mchPrimaryId) => {
+    return request({
+        url: `/payCenter/appInfo/${mchPrimaryId}`,
+        method: 'get',
+    });
+};
+export const getOrderList = (params) => {
+    return request({
+        url: '/payCenter/refundOrder/page',
+        method: 'get',
+        params,
+    });
+};
diff --git a/src/store/modules/pay/payOrder.js b/src/store/modules/pay/payOrder.js
new file mode 100644
index 0000000..e47c007
--- /dev/null
+++ b/src/store/modules/pay/payOrder.js
@@ -0,0 +1,115 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:21:30
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 11:37:49
+ * @Description: file content
+ */
+import * as appApi from '@/api/pay/application.js';
+import * as mchApi from '@/api/pay/merchant.js';
+import * as api from '@/api/pay/payOrder.js';
+import { ElMessage } from '@/plugins/element-plus';
+const state = {
+    code: 'PayCenterPayOrderManagement',
+    list: [],
+    detail: {},
+    total: 0,
+    opts: {
+        notifyStatus: [
+            {
+                value: 1,
+                label: '未通知',
+            },
+            {
+                value: 2,
+                label: '已通知',
+            },
+            {
+                value: 3,
+                label: '已响应',
+            },
+        ],
+        payStatus: [
+            {
+                value: 1,
+                label: '支付中',
+            },
+            {
+                value: 2,
+                label: '已关闭',
+            },
+            {
+                value: 3,
+                label: '支付成功',
+            },
+            {
+                value: 4,
+                label: '支付失败',
+            },
+            {
+                value: 5,
+                label: '部分退款',
+            },
+            {
+                value: 6,
+                label: '全额退款',
+            },
+        ],
+        merchant: [],
+        payType: [],
+        application: [],
+    },
+};
+const getters = {};
+const mutations = {
+    setList: (state, data) => (state.list = data),
+    setPayType: (state, data) => (state.opts.payType = data),
+    setMerchant: (state, data) => (state.opts.merchant = data),
+    setApplication: (state, data) => (state.opts.application = data),
+    setTotal: (state, data) => (state.total = data),
+    setDetail: (state, data) => (state.detail = data),
+};
+const actions = {
+    async search({ rootGetters, commit }, params) {
+        const res = await api.getOrderList({
+            ...rootGetters['local/page'](state.code),
+            ...params,
+        });
+        if (res) {
+            commit('setList', res?.records.map((i) => ({ ...i, isShow: !i.isDisabled })) || []);
+            commit('setTotal', res?.total || 0);
+        }
+    },
+    detail: async (context, id) => {
+        let res = await api.detail(id);
+        if (!res) {
+            ElMessage.error('加载详情失败');
+        }
+        return res;
+    },
+    async getMerchantList({ commit }) {
+        const res = await mchApi.getMerchantSelector();
+        if (res) {
+            commit('setMerchant', res || []);
+        }
+    },
+    async getApplicationList({ commit }) {
+        const res = await appApi.getApplicationSelector();
+        if (res) {
+            commit('setApplication', res || []);
+        }
+    },
+    async getPayType({ commit }) {
+        const res = await appApi.getPayType();
+        if (res) {
+            commit('setPayType', res || []);
+        }
+    },
+};
+
+export default {
+    state,
+    getters,
+    mutations,
+    actions,
+};
diff --git a/src/store/modules/pay/refundOrder.js b/src/store/modules/pay/refundOrder.js
new file mode 100644
index 0000000..13477ab
--- /dev/null
+++ b/src/store/modules/pay/refundOrder.js
@@ -0,0 +1,107 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-04 15:21:30
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 11:56:12
+ * @Description: file content
+ */
+import * as appApi from '@/api/pay/application.js';
+import * as mchApi from '@/api/pay/merchant.js';
+import * as api from '@/api/pay/refundOrder.js';
+import { ElMessage } from '@/plugins/element-plus';
+const state = {
+    code: 'PayCenterRefundOrderManagement',
+    list: [],
+    detail: {},
+    total: 0,
+    opts: {
+        notifyStatus: [
+            {
+                value: 1,
+                label: '未通知',
+            },
+            {
+                value: 2,
+                label: '已通知',
+            },
+            {
+                value: 3,
+                label: '已响应',
+            },
+        ],
+        refundStatus: [
+            {
+                value: 1,
+                label: '退款中',
+            },
+            {
+                value: 2,
+                label: '退款关闭',
+            },
+            {
+                value: 3,
+                label: '退款成功',
+            },
+            {
+                value: 4,
+                label: '退款失败',
+            },
+        ],
+        merchant: [],
+        payType: [],
+        application: [],
+    },
+};
+const getters = {};
+const mutations = {
+    setList: (state, data) => (state.list = data),
+    setPayType: (state, data) => (state.opts.payType = data),
+    setMerchant: (state, data) => (state.opts.merchant = data),
+    setApplication: (state, data) => (state.opts.application = data),
+    setTotal: (state, data) => (state.total = data),
+    setDetail: (state, data) => (state.detail = data),
+};
+const actions = {
+    async search({ rootGetters, commit }, params) {
+        const res = await api.getOrderList({
+            ...rootGetters['local/page'](state.code),
+            ...params,
+        });
+        if (res) {
+            commit('setList', res?.records.map((i) => ({ ...i, isShow: !i.isDisabled })) || []);
+            commit('setTotal', res?.total || 0);
+        }
+    },
+    detail: async (context, id) => {
+        let res = await api.detail(id);
+        if (!res) {
+            ElMessage.error('加载详情失败');
+        }
+        return res;
+    },
+    async getMerchantList({ commit }) {
+        const res = await mchApi.getMerchantSelector();
+        if (res) {
+            commit('setMerchant', res || []);
+        }
+    },
+    async getApplicationList({ commit }) {
+        const res = await appApi.getApplicationSelector();
+        if (res) {
+            commit('setApplication', res || []);
+        }
+    },
+    async getPayType({ commit }) {
+        const res = await appApi.getPayType();
+        if (res) {
+            commit('setPayType', res || []);
+        }
+    },
+};
+
+export default {
+    state,
+    getters,
+    mutations,
+    actions,
+};
diff --git a/src/views/pay/payOrder/list.vue b/src/views/pay/payOrder/list.vue
new file mode 100644
index 0000000..aba2dd0
--- /dev/null
+++ b/src/views/pay/payOrder/list.vue
@@ -0,0 +1,229 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-15 17:29:32
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 11:29:41
+ * @Description: file content
+-->
+<template>
+    <table-list
+        v-loading="loading"
+        :code="code"
+        :config="config"
+        :data="list"
+        :operation="['search']"
+        :reset="handleReset"
+        :total="total"
+        @search="handleSearch"
+    >
+        <template #search>
+            <el-form inline>
+                <el-form-item label="支付订单号">
+                    <el-input v-model="state.condition.payOrderNo" />
+                </el-form-item>
+                <el-form-item label="所属商户">
+                    <el-select v-model="state.condition.mchPrimaryId">
+                        <el-option
+                            v-for="item in opts.merchant"
+                            :key="item.mchPrimaryId"
+                            :label="item.mchName"
+                            :value="item.mchPrimaryId"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属应用">
+                    <el-select v-model="state.condition.appPrimaryId">
+                        <el-option
+                            v-for="item in opts.application"
+                            :key="item.appPrimaryId"
+                            :label="item.appName"
+                            :value="item.appPrimaryId"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="支付方式">
+                    <el-select v-model="state.condition.payCode">
+                        <el-option
+                            v-for="(item, idx) in opts.payType"
+                            :key="idx"
+                            :label="item.text"
+                            :value="item.code"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单状态">
+                    <el-select v-model="state.condition.payStatus">
+                        <el-option
+                            v-for="(item, idx) in opts.payStatus"
+                            :key="idx"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="通知状态">
+                    <el-select v-model="state.condition.notifyStatus">
+                        <el-option
+                            v-for="(item, idx) in opts.notifyStatus"
+                            :key="idx"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="下单时间" prop="dateRange">
+                    <el-date-picker
+                        v-model="state.condition.dateRange"
+                        :default-time="[new Date(0, 0, 0, 0, 0, 0), new Date(0, 0, 0, 23, 59, 59)]"
+                        type="datetimerange"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                    />
+                </el-form-item>
+            </el-form>
+        </template>
+    </table-list>
+</template>
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElSwitch from '@/components/extra/ElSwitch.vue';
+    const router = useRouter();
+    const store = useStore();
+    const loading = ref(false);
+    // 页面字典表数据
+    const opts = computed(() => store.state.payOrder.opts);
+    // 表格数据
+    const code = computed(() => store.state.payOrder.code);
+    const list = computed(() => _.cloneDeep(store.state.payOrder.list));
+    const total = computed(() => store.state.payOrder.total);
+    // 表格查询参数
+    const _condition = {
+        mchPrimaryId: '',
+        appPrimaryId: '',
+        payOrderNo: '',
+        payCode: '',
+        payStatus: '',
+        notifyStatus: '',
+        dateRange: '',
+    };
+    const state = reactive({
+        condition: { ..._condition },
+    });
+
+    /**
+     * 搜索
+     */
+    const handleSearch = async () => {
+        loading.value = true;
+        let par = { ...state.condition };
+        if (par.dateRange?.length) {
+            par.startTime = par.dateRange[0];
+            par.endTime = par.dateRange[1];
+            delete par.dateRange;
+        }
+        await store.dispatch('payOrder/search', par);
+        loading.value = false;
+    };
+
+    store.dispatch('payOrder/getMerchantList');
+    store.dispatch('payOrder/getApplicationList');
+    store.dispatch('payOrder/getPayType');
+    onActivated(handleSearch);
+    /**
+     * 重置
+     */
+    const handleReset = () => {
+        state.condition = { ..._condition };
+    };
+    const handleDetail = (id) => {
+        router.push({
+            name: 'UpdateApplication',
+            params: {
+                id,
+            },
+        });
+    };
+    const config = reactive({
+        columns: [
+            {
+                label: '所属商户',
+                align: 'left',
+                slots: {
+                    default: ({ row }) => <span>{row.mchInfo?.mchName}</span>,
+                },
+            },
+            {
+                label: '所属应用',
+                align: 'left',
+                slots: {
+                    default: ({ row }) => <span>{row.appInfo?.appName}</span>,
+                },
+            },
+            {
+                label: '支付订单号',
+                width: 250,
+                prop: 'payOrderNo',
+                slots: {
+                    default: ({ row }) => <span>{row.payOrderNo}</span>,
+                },
+            },
+            {
+                label: '支付方式',
+                width: 150,
+                prop: 'payCodeText',
+            },
+            {
+                label: '订单金额',
+                prop: 'amount',
+                width: 90,
+            },
+            {
+                label: '订单状态',
+                width: 90,
+                prop: 'payStatusText',
+            },
+            {
+                label: '通知状态',
+                width: 90,
+                prop: 'notifyStatusText',
+            },
+            {
+                label: '下单时间',
+                prop: 'createTime',
+                width: 100,
+                slots: {
+                    default: ({ row }) => <span>{row.createTime}</span>,
+                },
+            },
+            {
+                label: '操作',
+                width: 120,
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <ElButton type="text" onClick={() => handleDetail(row.appPrimaryId)}>
+                                详情
+                            </ElButton>
+                        </div>
+                    ),
+                },
+            },
+        ],
+    });
+</script>
+<style lang="less" scoped>
+    .batch-show-hide {
+        margin-left: 20px;
+    }
+    :deep(.row-ellipsis) {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+    }
+    :deep(.ctx-link) {
+        cursor: pointer;
+        &:hover {
+            color: var(--el-color-primary);
+        }
+    }
+</style>
diff --git a/src/views/pay/refundOrder/list.vue b/src/views/pay/refundOrder/list.vue
new file mode 100644
index 0000000..dea20c4
--- /dev/null
+++ b/src/views/pay/refundOrder/list.vue
@@ -0,0 +1,227 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-15 17:29:32
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 14:09:28
+ * @Description: file content
+-->
+<template>
+    <table-list
+        v-loading="loading"
+        :code="code"
+        :config="config"
+        :data="list"
+        :operation="['search']"
+        :reset="handleReset"
+        :total="total"
+        @search="handleSearch"
+    >
+        <template #search>
+            <el-form inline>
+                <el-form-item label="支付订单号">
+                    <el-input v-model="state.condition.payOrderNo" />
+                </el-form-item>
+                <el-form-item label="退款订单号">
+                    <el-input v-model="state.condition.refundOrderNo" />
+                </el-form-item>
+                <el-form-item label="所属商户">
+                    <el-select v-model="state.condition.mchPrimaryId">
+                        <el-option
+                            v-for="item in opts.merchant"
+                            :key="item.mchPrimaryId"
+                            :label="item.mchName"
+                            :value="item.mchPrimaryId"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属应用">
+                    <el-select v-model="state.condition.appPrimaryId">
+                        <el-option
+                            v-for="item in opts.application"
+                            :key="item.appPrimaryId"
+                            :label="item.appName"
+                            :value="item.appPrimaryId"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="退款状态">
+                    <el-select v-model="state.condition.refundStatus">
+                        <el-option
+                            v-for="(item, idx) in opts.refundStatus"
+                            :key="idx"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="通知状态">
+                    <el-select v-model="state.condition.notifyStatus">
+                        <el-option
+                            v-for="(item, idx) in opts.notifyStatus"
+                            :key="idx"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="申请时间" prop="dateRange">
+                    <el-date-picker
+                        v-model="state.condition.dateRange"
+                        :default-time="[new Date(0, 0, 0, 0, 0, 0), new Date(0, 0, 0, 23, 59, 59)]"
+                        type="datetimerange"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                    />
+                </el-form-item>
+            </el-form>
+        </template>
+    </table-list>
+</template>
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElSwitch from '@/components/extra/ElSwitch.vue';
+    const router = useRouter();
+    const store = useStore();
+    const loading = ref(false);
+    // 页面字典表数据
+    const opts = computed(() => store.state.refundOrder.opts);
+    // 表格数据
+    const code = computed(() => store.state.refundOrder.code);
+    const list = computed(() => _.cloneDeep(store.state.refundOrder.list));
+    const total = computed(() => store.state.refundOrder.total);
+    // 表格查询参数
+    const _condition = {
+        mchPrimaryId: '',
+        appPrimaryId: '',
+        payOrderNo: '',
+        refundOrderNo: '',
+        refundStatus: '',
+        notifyStatus: '',
+        dateRange: '',
+    };
+    const state = reactive({
+        condition: { ..._condition },
+    });
+
+    /**
+     * 搜索
+     */
+    const handleSearch = async () => {
+        loading.value = true;
+        let par = { ...state.condition };
+        if (par.dateRange?.length) {
+            par.startTime = par.dateRange[0];
+            par.endTime = par.dateRange[1];
+            delete par.dateRange;
+        }
+        await store.dispatch('refundOrder/search', par);
+        loading.value = false;
+    };
+
+    store.dispatch('refundOrder/getMerchantList');
+    store.dispatch('refundOrder/getApplicationList');
+    store.dispatch('refundOrder/getPayType');
+    onActivated(handleSearch);
+    /**
+     * 重置
+     */
+    const handleReset = () => {
+        state.condition = { ..._condition };
+    };
+    const handleDetail = (id) => {
+        router.push({
+            name: 'UpdateApplication',
+            params: {
+                id,
+            },
+        });
+    };
+    const config = reactive({
+        columns: [
+            {
+                label: '所属商户',
+                align: 'left',
+                slots: {
+                    default: ({ row }) => <span>{row.mchInfo?.mchName}</span>,
+                },
+            },
+            {
+                label: '所属应用',
+                align: 'left',
+                slots: {
+                    default: ({ row }) => <span>{row.appInfo?.appName}</span>,
+                },
+            },
+            {
+                label: '支付订单号',
+                width: 250,
+                slots: {
+                    default: ({ row }) => <span>{row.payOrderInfo?.payOrderNo}</span>,
+                },
+            },
+            {
+                label: '退款订单号',
+                width: 250,
+                slots: {
+                    default: ({ row }) => <span>{row.refundOrderNo}</span>,
+                },
+            },
+            {
+                label: '订单金额',
+                width: 90,
+                slots: {
+                    default: ({ row }) => <span>{row.payOrderInfo.amount}</span>,
+                },
+            },
+            {
+                label: '退款金额',
+                prop: 'refundAmount',
+                width: 90,
+            },
+            {
+                label: '退款状态',
+                width: 90,
+                prop: 'refundStatusText',
+            },
+            {
+                label: '通知状态',
+                width: 90,
+                prop: 'notifyStatusText',
+            },
+            {
+                label: '申请时间',
+                prop: 'createTime',
+                width: 100,
+                slots: {
+                    default: ({ row }) => <span>{row.createTime}</span>,
+                },
+            },
+            {
+                label: '操作',
+                width: 120,
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <ElButton type="text" onClick={() => handleDetail(row.appPrimaryId)}>
+                                详情
+                            </ElButton>
+                        </div>
+                    ),
+                },
+            },
+        ],
+    });
+</script>
+<style lang="less" scoped>
+    :deep(.row-ellipsis) {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+    }
+    :deep(.ctx-link) {
+        cursor: pointer;
+        &:hover {
+            color: var(--el-color-primary);
+        }
+    }
+</style>

From ae3ed669a3db829052d5d2237d651996ae82a40f Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 7 Jul 2022 15:52:13 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/payOrder.js               |  6 +--
 src/api/pay/refundOrder.js            |  6 +--
 src/store/modules/pay/payOrder.js     |  1 -
 src/store/modules/pay/refundOrder.js  |  3 +-
 src/views/pay/application/form.vue    | 10 +++--
 src/views/pay/merchant/form/index.vue | 10 ++---
 src/views/pay/payOrder/detail.vue     | 58 +++++++++++++++++++++++++++
 src/views/pay/payOrder/list.vue       | 16 ++++----
 src/views/pay/refundOrder/detail.vue  | 55 +++++++++++++++++++++++++
 src/views/pay/refundOrder/list.vue    | 18 ++++-----
 10 files changed, 148 insertions(+), 35 deletions(-)
 create mode 100644 src/views/pay/payOrder/detail.vue
 create mode 100644 src/views/pay/refundOrder/detail.vue

diff --git a/src/api/pay/payOrder.js b/src/api/pay/payOrder.js
index 14cdefa..e9a36c3 100644
--- a/src/api/pay/payOrder.js
+++ b/src/api/pay/payOrder.js
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 11:37:32
+ * @LastEditTime: 2022-07-07 14:55:24
  * @Description: file content
  */
 import request from '@/utils/request.js';
-export const detail = (mchPrimaryId) => {
+export const detail = (orderId) => {
     return request({
-        url: `/payCenter/appInfo/${mchPrimaryId}`,
+        url: `/payCenter/payOrder/${orderId}`,
         method: 'get',
     });
 };
diff --git a/src/api/pay/refundOrder.js b/src/api/pay/refundOrder.js
index 8ae372f..36af2ec 100644
--- a/src/api/pay/refundOrder.js
+++ b/src/api/pay/refundOrder.js
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-07-04 15:20:02
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 11:37:26
+ * @LastEditTime: 2022-07-07 15:25:01
  * @Description: file content
  */
 import request from '@/utils/request.js';
-export const detail = (mchPrimaryId) => {
+export const detail = (refundOrderId) => {
     return request({
-        url: `/payCenter/appInfo/${mchPrimaryId}`,
+        url: `/payCenter/refundOrder/${refundOrderId}`,
         method: 'get',
     });
 };
diff --git a/src/store/modules/pay/payOrder.js b/src/store/modules/pay/payOrder.js
index e47c007..384a710 100644
--- a/src/store/modules/pay/payOrder.js
+++ b/src/store/modules/pay/payOrder.js
@@ -67,7 +67,6 @@ const mutations = {
     setMerchant: (state, data) => (state.opts.merchant = data),
     setApplication: (state, data) => (state.opts.application = data),
     setTotal: (state, data) => (state.total = data),
-    setDetail: (state, data) => (state.detail = data),
 };
 const actions = {
     async search({ rootGetters, commit }, params) {
diff --git a/src/store/modules/pay/refundOrder.js b/src/store/modules/pay/refundOrder.js
index 13477ab..dfbdc2a 100644
--- a/src/store/modules/pay/refundOrder.js
+++ b/src/store/modules/pay/refundOrder.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 15:21:30
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 11:56:12
+ * @LastEditTime: 2022-07-07 15:25:26
  * @Description: file content
  */
 import * as appApi from '@/api/pay/application.js';
@@ -59,7 +59,6 @@ const mutations = {
     setMerchant: (state, data) => (state.opts.merchant = data),
     setApplication: (state, data) => (state.opts.application = data),
     setTotal: (state, data) => (state.total = data),
-    setDetail: (state, data) => (state.detail = data),
 };
 const actions = {
     async search({ rootGetters, commit }, params) {
diff --git a/src/views/pay/application/form.vue b/src/views/pay/application/form.vue
index 412f8c5..3602b35 100644
--- a/src/views/pay/application/form.vue
+++ b/src/views/pay/application/form.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 19:01:37
+ * @LastEditTime: 2022-07-07 15:51:16
  * @Description: file content
 -->
 <template>
     <div>
-        <el-form ref="formEl" label-width="160px" :model="form" :rules="rules">
+        <el-form class="main" ref="formEl" label-width="120px" :model="form" :rules="rules">
             <el-form-item label="商户平台" prop="mchPrimaryId">
                 <el-select v-model="form.mchPrimaryId" @change="handleChangeMch" :disabled="isEdit">
                     <el-option
@@ -196,4 +196,8 @@
         router.push({ name: 'PayApplication' });
     };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+    .main {
+        padding-right: 50px;
+    }
+</style>
diff --git a/src/views/pay/merchant/form/index.vue b/src/views/pay/merchant/form/index.vue
index 65e0eb5..e22d9ed 100644
--- a/src/views/pay/merchant/form/index.vue
+++ b/src/views/pay/merchant/form/index.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 11:08:35
+ * @LastEditTime: 2022-07-07 15:50:18
  * @Description: file content
 -->
 <template>
     <div>
-        <el-form ref="formEl" label-width="160px" :model="form" :rules="rules">
+        <el-form class="main" ref="formEl" label-width="160px" :model="form" :rules="rules">
             <el-form-item label="商户平台" prop="mchCode">
                 <el-radio-group v-model="form.mchCode" :disabled="idEdit">
                     <el-radio v-for="item in opts.platform" :key="item.code" :label="item.code" border>
@@ -116,9 +116,7 @@
     };
 </script>
 <style lang="less" scoped>
-    .form-container {
-        .el-form {
-            // width: 100%;
-        }
+    .main {
+        padding-right: 50px;
     }
 </style>
diff --git a/src/views/pay/payOrder/detail.vue b/src/views/pay/payOrder/detail.vue
new file mode 100644
index 0000000..956ae85
--- /dev/null
+++ b/src/views/pay/payOrder/detail.vue
@@ -0,0 +1,58 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-07 14:29:36
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 15:22:53
+ * @Description: file content
+-->
+<template>
+    <div class="main">
+        <el-descriptions title="支付订单信息" border :column="2">
+            <el-descriptions-item label="所属商户">{{ detail.mchInfo?.mchName }}</el-descriptions-item>
+            <el-descriptions-item label="所属应用">{{ detail.appInfo?.appName }}</el-descriptions-item>
+            <el-descriptions-item label="支付订单号">{{ detail.payOrderNo }}</el-descriptions-item>
+            <el-descriptions-item label="订单金额">{{ detail.amount }}</el-descriptions-item>
+            <el-descriptions-item label="商品标题">{{ detail.subject }}</el-descriptions-item>
+            <el-descriptions-item label="商品描述">{{ detail.body }}</el-descriptions-item>
+            <el-descriptions-item label="支付方式">{{ detail.payCodeText }}</el-descriptions-item>
+            <el-descriptions-item label="下单时间">{{ detail.createTime }}</el-descriptions-item>
+            <el-descriptions-item label="订单状态">{{ detail.payStatusText }}</el-descriptions-item>
+            <el-descriptions-item label="支付时间">{{ detail.successTime }}</el-descriptions-item>
+            <el-descriptions-item label="通知状态">{{ detail.notifyStatusText }}</el-descriptions-item>
+            <el-descriptions-item label="通知地址">{{ detail.notifyUrl }}</el-descriptions-item>
+            <el-descriptions-item label="已退款金额">{{ detail.refundAmount }}</el-descriptions-item>
+            <el-descriptions-item label="退款次数">{{ detail.refundTimes }}</el-descriptions-item>
+            <el-descriptions-item label="支付渠道订单">{{ detail.channelPayOrderNo }}</el-descriptions-item>
+            <el-descriptions-item label="支付渠道用户ID">{{ detail.channelUserId }}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions title="渠道订单信息" :column="1" class="channel">
+            <el-descriptions-item label="发起支付参数">
+                <el-input type="textarea" rows="2" v-model="detail.channelRequest" readonly />
+            </el-descriptions-item>
+            <el-descriptions-item label="发起支付响应">
+                <el-input type="textarea" v-model="detail.channelResponse" readonly />
+            </el-descriptions-item>
+            <el-descriptions-item label="渠道支付回调">
+                <el-input type="textarea" v-model="detail.channelNotify" readonly />
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
+</template>
+<script setup>
+    const store = useStore();
+    const route = useRoute();
+    const detail = reactive({});
+    const getDetail = async () => {
+        const res = await store.dispatch('payOrder/detail', route.params.id);
+        detail = Object.assign(detail, res);
+    };
+    onActivated(getDetail);
+</script>
+<style lang="less" scoped>
+    .main {
+        padding: 30px !important;
+    }
+    .channel {
+        padding: 30px 0;
+    }
+</style>
diff --git a/src/views/pay/payOrder/list.vue b/src/views/pay/payOrder/list.vue
index aba2dd0..b1ff10e 100644
--- a/src/views/pay/payOrder/list.vue
+++ b/src/views/pay/payOrder/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 11:29:41
+ * @LastEditTime: 2022-07-07 14:38:28
  * @Description: file content
 -->
 <template>
@@ -136,7 +136,7 @@
     };
     const handleDetail = (id) => {
         router.push({
-            name: 'UpdateApplication',
+            name: 'PayOrderDetail',
             params: {
                 id,
             },
@@ -148,19 +148,19 @@
                 label: '所属商户',
                 align: 'left',
                 slots: {
-                    default: ({ row }) => <span>{row.mchInfo?.mchName}</span>,
+                    default: ({ row }) => <span class="row-ellipsis">{row.mchInfo?.mchName}</span>,
                 },
             },
             {
                 label: '所属应用',
                 align: 'left',
                 slots: {
-                    default: ({ row }) => <span>{row.appInfo?.appName}</span>,
+                    default: ({ row }) => <span class="row-ellipsis">{row.appInfo?.appName}</span>,
                 },
             },
             {
                 label: '支付订单号',
-                width: 250,
+                minWidth: 110,
                 prop: 'payOrderNo',
                 slots: {
                     default: ({ row }) => <span>{row.payOrderNo}</span>,
@@ -189,18 +189,18 @@
             {
                 label: '下单时间',
                 prop: 'createTime',
-                width: 100,
+                minWidth: 100,
                 slots: {
                     default: ({ row }) => <span>{row.createTime}</span>,
                 },
             },
             {
                 label: '操作',
-                width: 120,
+                width: 60,
                 slots: {
                     default: ({ row }) => (
                         <div>
-                            <ElButton type="text" onClick={() => handleDetail(row.appPrimaryId)}>
+                            <ElButton type="text" onClick={() => handleDetail(row.payOrderId)}>
                                 详情
                             </ElButton>
                         </div>
diff --git a/src/views/pay/refundOrder/detail.vue b/src/views/pay/refundOrder/detail.vue
new file mode 100644
index 0000000..2c0c677
--- /dev/null
+++ b/src/views/pay/refundOrder/detail.vue
@@ -0,0 +1,55 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-07-07 14:29:36
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-07 15:42:44
+ * @Description: file content
+-->
+<template>
+    <div class="main">
+        <el-descriptions title="退款订单信息" border :column="2">
+            <el-descriptions-item label="所属商户">{{ detail.mchInfo?.mchName }}</el-descriptions-item>
+            <el-descriptions-item label="所属应用">{{ detail.appInfo?.appName }}</el-descriptions-item>
+            <el-descriptions-item label="支付订单号">{{ detail.payOrderInfo?.payOrderNo }}</el-descriptions-item>
+            <el-descriptions-item label="退款订单号">{{ detail.refundOrderNo }}</el-descriptions-item>
+            <el-descriptions-item label="订单金额">{{ detail.payOrderInfo?.amount }}</el-descriptions-item>
+            <el-descriptions-item label="退款金额">{{ detail.refundAmount }}</el-descriptions-item>
+            <el-descriptions-item label="退款状态">{{ detail.refundStatusText }}</el-descriptions-item>
+            <el-descriptions-item label="申请时间">{{ detail.createTime }}</el-descriptions-item>
+            <el-descriptions-item label="通知状态">{{ detail.notifyStatusText }}</el-descriptions-item>
+            <el-descriptions-item label="通知地址">{{ detail.notifyUrl }}</el-descriptions-item>
+            <el-descriptions-item label="退款渠道订单">
+                {{ detail.channelRefundOrderNo }}
+            </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions title="渠道订单信息" :column="1" class="channel">
+            <el-descriptions-item label="发起退款参数">
+                <el-input type="textarea" rows="2" v-model="detail.channelRequest" readonly />
+            </el-descriptions-item>
+            <el-descriptions-item label="发起退款响应">
+                <el-input type="textarea" v-model="detail.channelResponse" readonly />
+            </el-descriptions-item>
+            <el-descriptions-item label="渠道退款回调">
+                <el-input type="textarea" v-model="detail.channelNotify" readonly />
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
+</template>
+<script setup>
+    const store = useStore();
+    const route = useRoute();
+    const detail = reactive({});
+    const getDetail = async () => {
+        const res = await store.dispatch('refundOrder/detail', route.params.id);
+        detail = Object.assign(detail, res);
+    };
+    onActivated(getDetail);
+</script>
+<style lang="less" scoped>
+    .main {
+        padding: 30px !important;
+    }
+    .channel {
+        padding: 30px 0;
+    }
+</style>
diff --git a/src/views/pay/refundOrder/list.vue b/src/views/pay/refundOrder/list.vue
index dea20c4..489e994 100644
--- a/src/views/pay/refundOrder/list.vue
+++ b/src/views/pay/refundOrder/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 14:09:28
+ * @LastEditTime: 2022-07-07 15:30:13
  * @Description: file content
 -->
 <template>
@@ -129,7 +129,7 @@
     };
     const handleDetail = (id) => {
         router.push({
-            name: 'UpdateApplication',
+            name: 'RefundOrderDetail',
             params: {
                 id,
             },
@@ -141,26 +141,26 @@
                 label: '所属商户',
                 align: 'left',
                 slots: {
-                    default: ({ row }) => <span>{row.mchInfo?.mchName}</span>,
+                    default: ({ row }) => <span class="row-ellipsis">{row.mchInfo?.mchName}</span>,
                 },
             },
             {
                 label: '所属应用',
                 align: 'left',
                 slots: {
-                    default: ({ row }) => <span>{row.appInfo?.appName}</span>,
+                    default: ({ row }) => <span class="row-ellipsis">{row.appInfo?.appName}</span>,
                 },
             },
             {
                 label: '支付订单号',
-                width: 250,
+                minWidth: 110,
                 slots: {
                     default: ({ row }) => <span>{row.payOrderInfo?.payOrderNo}</span>,
                 },
             },
             {
                 label: '退款订单号',
-                width: 250,
+                minWidth: 110,
                 slots: {
                     default: ({ row }) => <span>{row.refundOrderNo}</span>,
                 },
@@ -190,18 +190,18 @@
             {
                 label: '申请时间',
                 prop: 'createTime',
-                width: 100,
+                minWidth: 100,
                 slots: {
                     default: ({ row }) => <span>{row.createTime}</span>,
                 },
             },
             {
                 label: '操作',
-                width: 120,
+                width: 60,
                 slots: {
                     default: ({ row }) => (
                         <div>
-                            <ElButton type="text" onClick={() => handleDetail(row.appPrimaryId)}>
+                            <ElButton type="text" onClick={() => handleDetail(row.refundOrderId)}>
                                 详情
                             </ElButton>
                         </div>

From 84db73c9b34f054ebeea98dab8b23d596476a2bf Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 7 Jul 2022 16:35:28 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/application/form.vue    | 33 ++++++++--------
 src/views/pay/application/index.vue   | 11 ++++--
 src/views/pay/merchant/form/index.vue | 56 +++++++++++++--------------
 src/views/pay/merchant/index.vue      |  9 +++--
 src/views/pay/payOrder/list.vue       | 15 ++++---
 src/views/pay/refundOrder/list.vue    | 14 ++++---
 6 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/src/views/pay/application/form.vue b/src/views/pay/application/form.vue
index 3602b35..ce770c6 100644
--- a/src/views/pay/application/form.vue
+++ b/src/views/pay/application/form.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:51:16
+ * @LastEditTime: 2022-07-07 16:26:45
  * @Description: file content
 -->
 <template>
@@ -131,24 +131,27 @@
         return meRules;
     });
 
-    const formEl = ref();
+    const formEl = ref(null);
 
-    store.dispatch('application/getMerchantList');
-    store.dispatch('application/getPayType');
-    onActivated(() => {
-        handlelLoadData();
-    });
-    /**
-     * 如果是编辑需要加载初始数据加载
-     */
-    const handlelLoadData = async () => {
+    const init = () => {
+        store.dispatch('application/getMerchantList');
+        store.dispatch('application/getPayType');
+        form.mchInfo = {};
+        formEl.value.resetFields();
         let id = route.params.id;
         if (id && form.id !== id) {
-            let res = await store.dispatch('application/detail', id);
-            res.payCodes = res.payCodes.split(',');
-            Object.assign(form, res);
+            handlelLoadDetail(id);
         }
     };
+    onActivated(init);
+    /**
+     * 编辑加载初始数据加载
+     */
+    const handlelLoadDetail = async (id) => {
+        let res = await store.dispatch('application/detail', id);
+        res.payCodes = res.payCodes.split(',');
+        Object.assign(form, res);
+    };
     /**
      * 切换商户时需要拿到当前商户信息，用来应用判断属于哪个平台
      */
@@ -191,8 +194,6 @@
         } catch (e) {}
     };
     const handleCancel = () => {
-        Object.assign(form, defaultForm);
-        formEl.value.resetFields();
         router.push({ name: 'PayApplication' });
     };
 </script>
diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
index eb21c8b..3e5c36c 100644
--- a/src/views/pay/application/index.vue
+++ b/src/views/pay/application/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 16:46:56
+ * @LastEditTime: 2022-07-07 16:32:44
  * @Description: file content
 -->
 <template>
@@ -92,10 +92,13 @@
         await store.dispatch('application/search', { ...state.condition });
         loading.value = false;
     };
+    const init = () => {
+        store.dispatch('application/getMerchantList');
+        store.dispatch('application/getPayType');
+        handleSearch();
+    };
 
-    store.dispatch('application/getMerchantList');
-    store.dispatch('application/getPayType');
-    onActivated(handleSearch);
+    onActivated(init);
     /**
      * 重置
      */
diff --git a/src/views/pay/merchant/form/index.vue b/src/views/pay/merchant/form/index.vue
index e22d9ed..4043884 100644
--- a/src/views/pay/merchant/form/index.vue
+++ b/src/views/pay/merchant/form/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:50:18
+ * @LastEditTime: 2022-07-07 16:30:11
  * @Description: file content
 -->
 <template>
@@ -62,34 +62,38 @@
     const aliFormEl = ref();
     const wxFormEl = ref();
 
-    store.dispatch('merchant/getMerchantPlatform');
-    onActivated(() => {
-        handlelLoadData();
-    });
+    const init = () => {
+        store.dispatch('merchant/getMerchantPlatform');
+        formEl.value.resetFields();
+        wxFormEl.value && wxFormEl.value.resetFields();
+        aliFormEl.value && aliFormEl.value.resetFields();
+        let id = route.params.id;
+        if (id && form.id !== id) {
+            handlelLoadDetail();
+        }
+    };
+    onActivated(init);
     /**
      * 如果是编辑需要加载初始数据加载
      */
-    const handlelLoadData = async () => {
-        let id = route.params.id;
-        if (id && form.id !== id) {
-            let res = await store.dispatch('merchant/detail', id);
-            if (res.mchCode === 'alipay') {
-                const publicKey = res.aliMchData.publicKey;
-                if (publicKey) {
-                    res.aliMchData.hasPublicKey = publicKey;
-                    delete res.aliMchData.publicKey;
-                }
-            } else {
-                const { apiKey, apiKeyV3, serialNo } = res.wxMchData;
-                res.wxMchData.hasApiKey = apiKey;
-                delete res.wxMchData.apiKey;
-                res.wxMchData.hasApiKeyV3 = apiKeyV3;
-                delete res.wxMchData.apiKeyV3;
-                res.wxMchData.hasSerialNo = serialNo;
-                delete res.wxMchData.serialNo;
+    const handlelLoadDetail = async () => {
+        let res = await store.dispatch('merchant/detail', id);
+        if (res.mchCode === 'alipay') {
+            const publicKey = res.aliMchData.publicKey;
+            if (publicKey) {
+                res.aliMchData.hasPublicKey = publicKey;
+                delete res.aliMchData.publicKey;
             }
-            Object.assign(form, res);
+        } else {
+            const { apiKey, apiKeyV3, serialNo } = res.wxMchData;
+            res.wxMchData.hasApiKey = apiKey;
+            delete res.wxMchData.apiKey;
+            res.wxMchData.hasApiKeyV3 = apiKeyV3;
+            delete res.wxMchData.apiKeyV3;
+            res.wxMchData.hasSerialNo = serialNo;
+            delete res.wxMchData.serialNo;
         }
+        Object.assign(form, res);
     };
     const handleSave = async () => {
         let validate = false;
@@ -108,10 +112,6 @@
             .catch(() => {});
     };
     const handleCancel = () => {
-        Object.assign(form, defaultForm);
-        wxFormEl.value && wxFormEl.value.resetFields();
-        aliFormEl.value && aliFormEl.value.resetFields();
-        formEl.value.resetFields();
         router.push({ name: 'PayMerchant' });
     };
 </script>
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
index 8b6474c..a24118e 100644
--- a/src/views/pay/merchant/index.vue
+++ b/src/views/pay/merchant/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 14:34:01
+ * @LastEditTime: 2022-07-07 16:31:04
  * @Description: file content
 -->
 <template>
@@ -72,6 +72,11 @@
     const state = reactive({
         condition: { ..._condition },
     });
+    const init = () => {
+        store.dispatch('merchant/getMerchantPlatform');
+        handleSearch();
+    };
+    onActivated(init);
 
     /**
      * 搜索
@@ -82,8 +87,6 @@
         loading.value = false;
     };
 
-    store.dispatch('merchant/getMerchantPlatform');
-    onActivated(handleSearch);
     /**
      * 重置
      */
diff --git a/src/views/pay/payOrder/list.vue b/src/views/pay/payOrder/list.vue
index b1ff10e..ec435b6 100644
--- a/src/views/pay/payOrder/list.vue
+++ b/src/views/pay/payOrder/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 14:38:28
+ * @LastEditTime: 2022-07-07 16:34:27
  * @Description: file content
 -->
 <template>
@@ -109,6 +109,14 @@
         condition: { ..._condition },
     });
 
+    store.dispatch('payOrder/getPayType');
+    const init = () => {
+        store.dispatch('payOrder/getMerchantList');
+        store.dispatch('payOrder/getApplicationList');
+        handleSearch();
+    };
+    onActivated(init);
+
     /**
      * 搜索
      */
@@ -123,11 +131,6 @@
         await store.dispatch('payOrder/search', par);
         loading.value = false;
     };
-
-    store.dispatch('payOrder/getMerchantList');
-    store.dispatch('payOrder/getApplicationList');
-    store.dispatch('payOrder/getPayType');
-    onActivated(handleSearch);
     /**
      * 重置
      */
diff --git a/src/views/pay/refundOrder/list.vue b/src/views/pay/refundOrder/list.vue
index 489e994..237e729 100644
--- a/src/views/pay/refundOrder/list.vue
+++ b/src/views/pay/refundOrder/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:30:13
+ * @LastEditTime: 2022-07-07 16:33:53
  * @Description: file content
 -->
 <template>
@@ -102,6 +102,14 @@
         condition: { ..._condition },
     });
 
+    store.dispatch('refundOrder/getPayType');
+    const init = () => {
+        store.dispatch('refundOrder/getMerchantList');
+        store.dispatch('refundOrder/getApplicationList');
+        handleSearch();
+    };
+    onActivated(init);
+
     /**
      * 搜索
      */
@@ -117,10 +125,6 @@
         loading.value = false;
     };
 
-    store.dispatch('refundOrder/getMerchantList');
-    store.dispatch('refundOrder/getApplicationList');
-    store.dispatch('refundOrder/getPayType');
-    onActivated(handleSearch);
     /**
      * 重置
      */

From a5559eb9fc605e8621b18c049f88ad961bd73b0b Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 7 Jul 2022 16:44:04 +0800
Subject: [PATCH 09/15] =?UTF-8?q?fix:=20=E5=95=86=E6=88=B7=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/merchant/form/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/pay/merchant/form/index.vue b/src/views/pay/merchant/form/index.vue
index 4043884..8741eed 100644
--- a/src/views/pay/merchant/form/index.vue
+++ b/src/views/pay/merchant/form/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 16:30:11
+ * @LastEditTime: 2022-07-07 16:38:06
  * @Description: file content
 -->
 <template>
@@ -69,14 +69,14 @@
         aliFormEl.value && aliFormEl.value.resetFields();
         let id = route.params.id;
         if (id && form.id !== id) {
-            handlelLoadDetail();
+            handlelLoadDetail(id);
         }
     };
     onActivated(init);
     /**
      * 如果是编辑需要加载初始数据加载
      */
-    const handlelLoadDetail = async () => {
+    const handlelLoadDetail = async (id) => {
         let res = await store.dispatch('merchant/detail', id);
         if (res.mchCode === 'alipay') {
             const publicKey = res.aliMchData.publicKey;

From 43bec0f46e5e826a7147f0551f9f5aacc1cb866c Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Sat, 9 Jul 2022 11:15:27 +0800
Subject: [PATCH 10/15] =?UTF-8?q?pref:=20oos=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file.js                      | 36 ++++++++++++++++++----------
 src/views/pay/application/form.vue   |  4 ++--
 src/views/pay/merchant/form/ali.vue  |  6 ++---
 src/views/pay/merchant/form/wx.vue   |  9 +++----
 src/views/pay/payOrder/detail.vue    |  2 +-
 src/views/pay/refundOrder/detail.vue |  4 ++--
 6 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/api/file.js b/src/api/file.js
index dc1a8e2..46c4d59 100644
--- a/src/api/file.js
+++ b/src/api/file.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: ch
+ * @Date: 2022-07-07 17:27:04
+ * @LastEditors: ch
+ * @LastEditTime: 2022-07-09 11:14:35
+ * @Description: file content
+ */
 import request from '@/utils/request';
 // OSS签名
 export function sign(serviceName, configId) {
@@ -9,23 +16,26 @@ export function sign(serviceName, configId) {
             configId,
         },
     });
-    // console.info(serviceName, configId);
-    // return {
-    //     accessId: 'LTAI4GHRNb5Xn2w5NeHVbR4c',
-    //     policy: 'eyJleHBpcmF0aW9uIjoiMjAyMi0wNC0xNVQyMDowODoyNi4zMTlaIiwiY29uZGl0aW9ucyI6W1siY29udGVudC1sZW5ndGgtcmFuZ2UiLDAsMTA0ODU3NjAwMF0sWyJzdGFydHMtd2l0aCIsIiRrZXkiLCJ0ZXN0LyJdXX0=',
-    //     signature: 'okaB3sNp3vzyfM0S3ypudaUAZ+0=',
-    //     dir: 'test/',
-    //     host: 'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com',
-    //     expire: '1650053306',
-    // };
 }
+export function payCenterSign() {
+    return request({
+        url: '/payCenter/oss/ossSignature',
+        method: 'GET',
+    });
+}
+
 // 上传文件
 export async function upload(serviceName, configId, file, cancelToken) {
-    let oss = await sign(serviceName, configId);
+    let oss = {};
+    if (serviceName) {
+        oss = await sign(serviceName, configId);
+    } else {
+        oss = await payCenterSign();
+    }
+    // return false;
     let data = new FormData();
-    let arr = file.name.split('/');
-    arr[arr.length - 1] = encodeURIComponent(arr[arr.length - 1]);
-    data.append('name', arr.join('/'));
+    let name = file.uid + file.name.substring(file.name.lastIndexOf('.'));
+    data.append('name', name);
     data.append('key', `${oss.dir}${'${filename}'}`);
     data.append('policy', oss.policy);
     data.append('OSSAccessKeyId', oss.accessId);
diff --git a/src/views/pay/application/form.vue b/src/views/pay/application/form.vue
index ce770c6..e40fa6a 100644
--- a/src/views/pay/application/form.vue
+++ b/src/views/pay/application/form.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 16:26:45
+ * @LastEditTime: 2022-07-09 10:38:04
  * @Description: file content
 -->
 <template>
@@ -170,7 +170,7 @@
      * 上传阿里应用证书
      */
     const handleUpload = async ({ file }) => {
-        const res = await upload('payCenter', 'application/', file);
+        const res = await upload(null, null, file);
         form.appCertUrl = res;
     };
     const handleSave = async () => {
diff --git a/src/views/pay/merchant/form/ali.vue b/src/views/pay/merchant/form/ali.vue
index cf37312..f726af7 100644
--- a/src/views/pay/merchant/form/ali.vue
+++ b/src/views/pay/merchant/form/ali.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 17:57:55
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 10:18:14
+ * @LastEditTime: 2022-07-09 10:39:00
  * @Description: file content
 -->
 <template>
@@ -100,14 +100,14 @@
      * 上传公钥证书
      */
     const handleUploadCert = async ({ file }) => {
-        const res = await upload('payCenter', 'merchant/', file);
+        const res = await upload(null, null, file);
         form.aliPayCertUrl = res;
     };
     /**
      * 上传根证书
      */
     const handleUploadRootCert = async ({ file }) => {
-        const res = await upload('payCenter', 'merchant/', file);
+        const res = await upload(null, null, file);
         form.aliPayRootCertUrl = res;
     };
     /**
diff --git a/src/views/pay/merchant/form/wx.vue b/src/views/pay/merchant/form/wx.vue
index 4211768..d93ca0e 100644
--- a/src/views/pay/merchant/form/wx.vue
+++ b/src/views/pay/merchant/form/wx.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 17:57:45
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 11:18:45
+ * @LastEditTime: 2022-07-09 11:14:59
  * @Description: file content
 -->
 <template>
@@ -149,21 +149,22 @@
      * 上传公钥证书
      */
     const handleUploadCert = async ({ file }) => {
-        const res = await upload('payCenter', 'merchant/', file);
+        const res = await upload(null, null, file);
         form.certOssUrl = res;
     };
     /**
      * 上传私钥证书
      */
     const handleUploadKeyCert = async ({ file }) => {
-        const res = await upload('payCenter', 'merchant/', file);
+        const res = await upload(null, null, file);
         form.keyOssUrl = res;
     };
     /**
      * 上传p12证书
      */
     const handleUploadCert120 = async ({ file }) => {
-        const res = await upload('payCenter', 'merchant/', file);
+        // const res = await upload('payCenter', 'merchant/', file);
+        const res = await upload(null, null, file);
         form.certP12OssUrl = res;
     };
     /**
diff --git a/src/views/pay/payOrder/detail.vue b/src/views/pay/payOrder/detail.vue
index 956ae85..5f0192f 100644
--- a/src/views/pay/payOrder/detail.vue
+++ b/src/views/pay/payOrder/detail.vue
@@ -41,7 +41,7 @@
 <script setup>
     const store = useStore();
     const route = useRoute();
-    const detail = reactive({});
+    let detail = reactive({});
     const getDetail = async () => {
         const res = await store.dispatch('payOrder/detail', route.params.id);
         detail = Object.assign(detail, res);
diff --git a/src/views/pay/refundOrder/detail.vue b/src/views/pay/refundOrder/detail.vue
index 2c0c677..c72d4e5 100644
--- a/src/views/pay/refundOrder/detail.vue
+++ b/src/views/pay/refundOrder/detail.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-07 14:29:36
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:42:44
+ * @LastEditTime: 2022-07-09 10:41:24
  * @Description: file content
 -->
 <template>
@@ -38,7 +38,7 @@
 <script setup>
     const store = useStore();
     const route = useRoute();
-    const detail = reactive({});
+    let detail = reactive({});
     const getDetail = async () => {
         const res = await store.dispatch('refundOrder/detail', route.params.id);
         detail = Object.assign(detail, res);

From 60892836962560466ec81a48a702b2f327e28451 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 11 Jul 2022 17:25:29 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file.js                     | 18 ++++++++++++------
 src/views/pay/application/form.vue  |  4 ++--
 src/views/pay/merchant/form/ali.vue |  6 +++---
 src/views/pay/merchant/form/wx.vue  | 11 +++++------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/api/file.js b/src/api/file.js
index 46c4d59..bfa0b01 100644
--- a/src/api/file.js
+++ b/src/api/file.js
@@ -2,9 +2,10 @@
  * @Author: ch
  * @Date: 2022-07-07 17:27:04
  * @LastEditors: ch
- * @LastEditTime: 2022-07-09 11:14:35
+ * @LastEditTime: 2022-07-11 17:24:09
  * @Description: file content
  */
+import { ElMessage } from '@/plugins/element-plus';
 import request from '@/utils/request';
 // OSS签名
 export function sign(serviceName, configId) {
@@ -25,18 +26,23 @@ export function payCenterSign() {
 }
 
 // 上传文件
-export async function upload(serviceName, configId, file, cancelToken) {
+export async function upload(serviceName, configId, file, cancelToken, suffix) {
+    const _suffix = file.name.substring(file.name.lastIndexOf('.'));
+    const suffixObj = typeof suffix === 'string' ? suffix.split(',') : suffix;
+    if (!suffixObj.includes(_suffix)) {
+        ElMessage.error('上传文件类型错误');
+        return '';
+    }
     let oss = {};
     if (serviceName) {
         oss = await sign(serviceName, configId);
     } else {
         oss = await payCenterSign();
     }
-    // return false;
-    let data = new FormData();
-    let name = file.uid + file.name.substring(file.name.lastIndexOf('.'));
+    const data = new FormData();
+    const name = file.uid + _suffix;
     data.append('name', name);
-    data.append('key', `${oss.dir}${'${filename}'}`);
+    data.append('key', `${oss.dir}${name}`);
     data.append('policy', oss.policy);
     data.append('OSSAccessKeyId', oss.accessId);
     data.append('Signature', oss.signature);
diff --git a/src/views/pay/application/form.vue b/src/views/pay/application/form.vue
index e40fa6a..659fff8 100644
--- a/src/views/pay/application/form.vue
+++ b/src/views/pay/application/form.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-09 10:38:04
+ * @LastEditTime: 2022-07-11 17:06:12
  * @Description: file content
 -->
 <template>
@@ -170,7 +170,7 @@
      * 上传阿里应用证书
      */
     const handleUpload = async ({ file }) => {
-        const res = await upload(null, null, file);
+        const res = await upload(null, null, file, null, '.crt');
         form.appCertUrl = res;
     };
     const handleSave = async () => {
diff --git a/src/views/pay/merchant/form/ali.vue b/src/views/pay/merchant/form/ali.vue
index f726af7..e09601c 100644
--- a/src/views/pay/merchant/form/ali.vue
+++ b/src/views/pay/merchant/form/ali.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 17:57:55
  * @LastEditors: ch
- * @LastEditTime: 2022-07-09 10:39:00
+ * @LastEditTime: 2022-07-11 17:07:42
  * @Description: file content
 -->
 <template>
@@ -100,14 +100,14 @@
      * 上传公钥证书
      */
     const handleUploadCert = async ({ file }) => {
-        const res = await upload(null, null, file);
+        const res = await upload(null, null, file, null, '.crt');
         form.aliPayCertUrl = res;
     };
     /**
      * 上传根证书
      */
     const handleUploadRootCert = async ({ file }) => {
-        const res = await upload(null, null, file);
+        const res = await upload(null, null, file, null, '.crt');
         form.aliPayRootCertUrl = res;
     };
     /**
diff --git a/src/views/pay/merchant/form/wx.vue b/src/views/pay/merchant/form/wx.vue
index d93ca0e..4a108ff 100644
--- a/src/views/pay/merchant/form/wx.vue
+++ b/src/views/pay/merchant/form/wx.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 17:57:45
  * @LastEditors: ch
- * @LastEditTime: 2022-07-09 11:14:59
+ * @LastEditTime: 2022-07-11 17:06:45
  * @Description: file content
 -->
 <template>
@@ -27,7 +27,7 @@
                 <el-button type="primary" v-else>上传</el-button>
             </el-upload>
         </el-form-item>
-        <el-form-item label="商户证书(key.pem)" prop="certOssUrl">
+        <el-form-item label="商户证书(cert.pem)" prop="certOssUrl">
             <el-upload action="none" accept=".pem" :show-file-list="false" :http-request="handleUploadCert">
                 <el-button type="success" v-if="modelValue.hasCert || form.certOssUrl">已上传，点击重新上传</el-button>
                 <el-button type="primary" v-else>上传</el-button>
@@ -149,22 +149,21 @@
      * 上传公钥证书
      */
     const handleUploadCert = async ({ file }) => {
-        const res = await upload(null, null, file);
+        const res = await upload(null, null, file, null, '.pem');
         form.certOssUrl = res;
     };
     /**
      * 上传私钥证书
      */
     const handleUploadKeyCert = async ({ file }) => {
-        const res = await upload(null, null, file);
+        const res = await upload(null, null, file, null, '.pem');
         form.keyOssUrl = res;
     };
     /**
      * 上传p12证书
      */
     const handleUploadCert120 = async ({ file }) => {
-        // const res = await upload('payCenter', 'merchant/', file);
-        const res = await upload(null, null, file);
+        const res = await upload(null, null, file, null, '.p12');
         form.certP12OssUrl = res;
     };
     /**

From a20f84dd7eb2fd24001151cc3de4cc30f86c079d Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 11 Jul 2022 17:34:50 +0800
Subject: [PATCH 12/15] =?UTF-8?q?fix:=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8DUUID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/file.js b/src/api/file.js
index bfa0b01..702e25b 100644
--- a/src/api/file.js
+++ b/src/api/file.js
@@ -2,11 +2,12 @@
  * @Author: ch
  * @Date: 2022-07-07 17:27:04
  * @LastEditors: ch
- * @LastEditTime: 2022-07-11 17:24:09
+ * @LastEditTime: 2022-07-11 17:34:08
  * @Description: file content
  */
 import { ElMessage } from '@/plugins/element-plus';
 import request from '@/utils/request';
+import { CreateUUID } from '@/utils/utils';
 // OSS签名
 export function sign(serviceName, configId) {
     return request({
@@ -40,7 +41,7 @@ export async function upload(serviceName, configId, file, cancelToken, suffix) {
         oss = await payCenterSign();
     }
     const data = new FormData();
-    const name = file.uid + _suffix;
+    const name = CreateUUID() + _suffix;
     data.append('name', name);
     data.append('key', `${oss.dir}${name}`);
     data.append('policy', oss.policy);

From f3135880c19c2170b64264aea45805d612c50e31 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 11 Jul 2022 17:47:54 +0800
Subject: [PATCH 13/15] =?UTF-8?q?fix:=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8DUUID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/file.js b/src/api/file.js
index 702e25b..11dccfc 100644
--- a/src/api/file.js
+++ b/src/api/file.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-07 17:27:04
  * @LastEditors: ch
- * @LastEditTime: 2022-07-11 17:34:08
+ * @LastEditTime: 2022-07-11 17:47:42
  * @Description: file content
  */
 import { ElMessage } from '@/plugins/element-plus';
@@ -30,7 +30,7 @@ export function payCenterSign() {
 export async function upload(serviceName, configId, file, cancelToken, suffix) {
     const _suffix = file.name.substring(file.name.lastIndexOf('.'));
     const suffixObj = typeof suffix === 'string' ? suffix.split(',') : suffix;
-    if (!suffixObj.includes(_suffix)) {
+    if (suffixObj && !suffixObj.includes(_suffix)) {
         ElMessage.error('上传文件类型错误');
         return '';
     }

From 3e290fec0865fb88d73a3869457b719d49a7abc5 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 11 Jul 2022 18:07:39 +0800
Subject: [PATCH 14/15] =?UTF-8?q?fix:=E5=BA=94=E7=94=A8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/application/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
index 3e5c36c..ee9386f 100644
--- a/src/views/pay/application/index.vue
+++ b/src/views/pay/application/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 16:32:44
+ * @LastEditTime: 2022-07-11 18:07:14
  * @Description: file content
 -->
 <template>
@@ -46,7 +46,7 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商户状态">
+                <el-form-item label="应用状态">
                     <el-select v-model="state.condition.isDisabled">
                         <el-option
                             v-for="(item, idx) in opts.status"

From d1a65b086d863baa794cc02730985c3ff2d99e90 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 15 Jul 2022 09:35:31 +0800
Subject: [PATCH 15/15] =?UTF-8?q?pref:=E7=BB=9F=E4=B8=80=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4,=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env            |  8 +++----
 .env.bate       |  4 ++++
 .env.test       |  2 +-
 components.d.ts | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
 package.json    |  5 +++-
 vite.config.js  | 18 +++++++--------
 6 files changed, 83 insertions(+), 15 deletions(-)
 create mode 100644 .env.bate
 create mode 100644 components.d.ts

diff --git a/.env b/.env
index 714c44b..f6306ba 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-VITE_BASE_URL=/api
+VITE_BASE_URL=https://k8s-horse-gateway.mashibing.cn
 VITE_SOCKET_URL=wss://k8s-horse-gateway.mashibing.cn/ws
-#VITE_SOCKET_URL=ws://192.168.10.93:8090/ws
-VITE_REQUEST_TIMEOUT=5000
-VITE_BROWSER_URL = https://k8s-shop-pc.mashibing.cn
\ No newline at end of file
+VITE_BROWSER_URL = https://k8s-shop-pc.mashibing.cn
+
+VITE_REQUEST_TIMEOUT=5000
\ No newline at end of file
diff --git a/.env.bate b/.env.bate
new file mode 100644
index 0000000..811cd1a
--- /dev/null
+++ b/.env.bate
@@ -0,0 +1,4 @@
+VITE_BASE_URL=https://you-gateway.mashibing.com
+VITE_SOCKET_URL=wss://you-gateway.mashibing.com/ws
+VITE_REQUEST_TIMEOUT=20000
+VITE_BROWSER_URL = https://you.mashibing.com
diff --git a/.env.test b/.env.test
index 21b266b..9a974a3 100644
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,4 @@
-VITE_BASE_URL=https://k8s-horse-gateway.mashibing.cn/
+VITE_BASE_URL=https://k8s-horse-gateway.mashibing.cn
 VITE_SOCKET_URL=wss://k8s-horse-gateway.mashibing.cn/ws
 VITE_REQUEST_TIMEOUT=20000
 VITE_BROWSER_URL = https://k8s-shop-pc.mashibing.cn
diff --git a/components.d.ts b/components.d.ts
new file mode 100644
index 0000000..9e35d3f
--- /dev/null
+++ b/components.d.ts
@@ -0,0 +1,61 @@
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/vue-next/pull/3399
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    ElArea: typeof import('./src/components/ElArea.vue')['default']
+    ElAvatar: typeof import('element-plus/es')['ElAvatar']
+    ElBadge: typeof import('element-plus/es')['ElBadge']
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
+    ElButton: typeof import('./src/components/extra/ElButton.vue')['default']
+    ElCard: typeof import('element-plus/es')['ElCard']
+    ElCascader: typeof import('./src/components/extra/ElCascader.vue')['default']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('./src/components/extra/ElCheckboxGroup.vue')['default']
+    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
+    ElDialog: typeof import('./src/components/extra/ElDialog.vue')['default']
+    ElDropdown: typeof import('./src/components/extra/ElDropdown.vue')['default']
+    ElEditor: typeof import('./src/components/ElEditor.vue')['default']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElIcon: typeof import('./src/components/extra/ElIcon.vue')['default']
+    ElImage: typeof import('./src/components/extra/ElImage.vue')['default']
+    ElInput: typeof import('./src/components/extra/ElInput.vue')['default']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('./src/components/extra/ElRadioGroup.vue')['default']
+    ElRate: typeof import('element-plus/es')['ElRate']
+    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSelect: typeof import('./src/components/extra/ElSelect.vue')['default']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
+    ElSwitch: typeof import('./src/components/extra/ElSwitch.vue')['default']
+    ElTable: typeof import('./src/components/extra/ElTable.vue')['default']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTooltip: typeof import('./src/components/extra/ElTooltip.vue')['default']
+    ElTree: typeof import('element-plus/es')['ElTree']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
+    ElUploadFile: typeof import('./src/components/ElUploadFile.vue')['default']
+    ElUploadImage: typeof import('./src/components/ElUploadImage.vue')['default']
+    Loading: typeof import('element-plus/es')['ElLoadingDirective']
+    TableList: typeof import('./src/components/TableList.vue')['default']
+  }
+}
+
+export { }
diff --git a/package.json b/package.json
index f97a241..8158044 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,10 @@
     "private": true,
     "version": "0.0.1",
     "scripts": {
-        "dev": "vite",
+        "server": "vite",
+        "server:test": "vite --mode test",
+        "server:bate": "vite --mode bate",
+        "server:prod": "vite --mode prod",
         "build:test": "vite build --mode test",
         "build:beta": "vite build --mode beta",
         "build:prod": "vite build --mode prod",
diff --git a/vite.config.js b/vite.config.js
index 5cfdf0e..1e8d5c8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -16,12 +16,12 @@ export default (configEnv) => {
     return {
         server: {
             host: '0.0.0.0',
-            port: 3000,
+            port: 3001,
             open: false,
             proxy: {
                 '/api': {
-                    target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
-                    // target: 'https://you-gateway.mashibing.com', // 生产环境
+                    // target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
+                    target: 'https://you-gateway.mashibing.com', // 生产环境
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/api/, ''),
                 },
@@ -67,13 +67,13 @@ export default (configEnv) => {
                 dts: 'src/auto-imports.d.ts',
             }),
             Components({
-                dirs: ['src/components'],
-                extensions: ['vue', 'jsx', 'tsx', 'js', 'ts'],
-                deep: true,
+                // dirs: ['src/components'],
+                // extensions: ['vue', 'jsx', 'tsx', 'js', 'ts'],
+                // deep: true,
                 resolvers: [ElementPlusResolver()],
-                dts: 'src/components.d.ts',
-                include: [/\.tsx$/, /\.jsx$/, /\.ts$/, /\.js$/, /\.vue$/, /\.vue\?vue/],
-                exclude: [/[\\/]node_modules[\\/]/, /[\\/]\.git[\\/]/],
+                // dts: 'src/components.d.ts',
+                // include: [/\.tsx$/, /\.jsx$/, /\.ts$/, /\.js$/, /\.vue$/, /\.vue\?vue/],
+                // exclude: [/[\\/]node_modules[\\/]/, /[\\/]\.git[\\/]/],
             }),
             removeConsole(),
             globalStyle({