更改文档为https

上线
优化订单列表
2024-02-26 16:16:54 +08:00 · 2024-02-23 18:29:14 +08:00 · 2024-02-22 14:56:35 +08:00 · 2024-02-21 18:41:36 +08:00 · 2024-02-20 14:56:22 +08:00 · 2024-02-20 13:48:14 +08:00
20 changed files with 890 additions and 739 deletions
--- a/index.html
+++ b/index.html
@@ -1,16 +1,14 @@
 <!DOCTYPE html>
 <html lang="zh-cn">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favico.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>vue admin</title>
+  </head>

-<head>
-  <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="/favico.ico" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>vue admin</title>
-</head>
-
-<body>
-  <div id="app"></div>
-  <script type="module" src="/src/main.js"></script>
-</body>
-
-</html>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.js"></script>
+  </body>
+</html>
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.7",
+	"version": "1.3.14",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -13,6 +13,7 @@
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"axios": "^1.3.4",
+		"clipboard": "^2.0.11",
 		"echarts": "^5.4.2",
 		"element-china-area-data": "^6.1.0",
 		"element-plus": "^2.3.0",
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -99,4 +99,36 @@ export function unread(params) {
    });
 }

+/**
+ * 获取总流水
+ * @returns 
+ */
+export function querySumAmount() {
+    return request({
+        method: "post",
+        url: "/open/querySumAmount"
+    });
+}
+
+/**
+ * 获取七日数据
+ * @returns 
+ */
+export function queryRecentlyData() {
+    return request({
+        method: "post",
+        url: "/open/queryRecentlyData"
+    });
+}
+
+/**
+ * 获取近一年流水
+ * @returns 
+ */
+export function queryRecentYears() {
+    return request({
+        method: "post",
+        url: "/open/queryRecentYears"
+    });
+}

--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -274,15 +274,26 @@ export function updateAuthentication(params) {
 }

 /**
- * 收银点列表
+ * 查询开发私钥
 * @param {*} data 
 * @returns 
 */
-export function queryMerchantCashPlace(params) {
+export function queryOrgan() {
    return request({
-        method: 'get',
-        url: '/agency/queryMerchantCashPlace',
-        params
+        method: 'post',
+        url: '/open/queryOrgan'
    })
 }

+/**
+ * 查询订单信息
+ * @param {*} data 
+ * @returns 
+ */
+export function queryOrder(data) {
+    return request({
+        method: 'post',
+        url: '/open/queryOrder',
+        data
+    })
+}
--- a/src/components/chartCard.vue
+++ b/src/components/chartCard.vue
@@ -1,10 +1,10 @@
 <template>
    <div class="chart_header">
-        <div class="item" :class="{ active1: chartType == 1 }" @click="chartTypeChange(1)">
+        <!-- <div class="item" :class="{ active1: chartType == 1 }" @click="chartTypeChange(1)">
            <div class="icon"></div>
            <span>收益</span>
-        </div>
-        <div class="item" :class="{ active2: chartType == 2 }" @click="chartTypeChange(2)">
+        </div> -->
+        <div class="item" :class="{ active2: chartType == 2 }">
            <div class="icon"></div>
            <span>流水</span>
        </div>
@@ -16,7 +16,7 @@
 </template>

 <script setup>
-import { getChartData } from '@/api/home.js'
+import { queryRecentlyData, queryRecentYears } from '@/api/home.js'
 import * as echarts from "echarts"
 import { dayjs } from 'element-plus'
 import hooks from '@/hooks'
@@ -31,7 +31,7 @@ const chartsObj = {
 };

 const chartLoading = ref(true)
-const chartType = ref(1)
+const chartType = ref(2)
 const chartYear = ref(dayjs().format('YYYY'))
 const props = defineProps({
    userId: {
@@ -41,7 +41,7 @@ const props = defineProps({
 })

 // 初始化折线图
-function initDeicount(yearData = [], sevenData = [], sevenDataTime = []) {
+function initDeicount(yearData = [], yearDataTime = [], sevenData = [], sevenDataTime = []) {
    if (!chartsObj.lineRef1 && !chartsObj.lineRef2) {
        chartsObj.lineRef1 = echarts.init(lineRef1.value);
        chartsObj.lineRef2 = echarts.init(lineRef2.value);
@@ -58,7 +58,7 @@ function initDeicount(yearData = [], sevenData = [], sevenDataTime = []) {
        xAxis: [
            {
                type: 'category',
-                data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二'],
+                data: yearDataTime,
                axisPointer: {
                    type: 'shadow'
                },
@@ -124,26 +124,35 @@ function chartTypeChange(t) {
 async function getChartDataMethod() {
    try {
        let yearData = ''
+        let yearDataTime = ''
        let sevenData = ''
        let sevenDataTime = ''
-        if (chartType.value == 1) {
-            // 收益
-            const res1 = await getChartData(4, props.userId)
-            const res2 = await getChartData(2, props.userId)
-            yearData = res1.map(item => item.price.toFixed(2))
-            sevenData = res2.map(item => item.price.toFixed(2))
-            sevenDataTime = res2.map(item => dayjs(item.times).format('MM/DD'))
-        } else {
-            // 流水
-            const res1 = await getChartData(3, props.userId)
-            const res2 = await getChartData(1, props.userId)
-            yearData = res1.map(item => item.consumeFee)
-            sevenData = res2.map(item => item.consumeFee)
-            sevenDataTime = res2.map(item => dayjs(item.times).format('MM/DD'))
-        }
-        initDeicount(yearData, sevenData, sevenDataTime)
+        // if (chartType.value == 1) {
+        //     // 收益
+        //     const res1 = await getChartData(4, props.userId)
+        //     const res2 = await getChartData(2, props.userId)
+        //     yearData = res1.map(item => item.price.toFixed(2))
+        //     sevenData = res2.map(item => item.price.toFixed(2))
+        //     sevenDataTime = res2.map(item => dayjs(item.times).format('MM/DD'))
+        // } else {
+        //     // 流水
+        //     const res1 = await getChartData(3, props.userId)
+        //     const res2 = await getChartData(1, props.userId)
+        //     yearData = res1.map(item => item.consumeFee)
+        //     sevenData = res2.map(item => item.consumeFee)
+        //     sevenDataTime = res2.map(item => dayjs(item.times).format('MM/DD'))
+        // }
+        const res1 = await queryRecentYears()
+        const res2 = await queryRecentlyData()
+        yearData = res1.map(item => item.amount)
+        yearDataTime = res1.map(item => item.mymonth)
+        sevenData = res2.map(item => item.amount)
+        sevenDataTime = res2.map(item => item.createDate)
+        initDeicount(yearData, yearDataTime, sevenData, sevenDataTime)
        chartLoading.value = false
-    } catch (error) { }
+    } catch (error) {
+        console.log(error);
+    }
 }

 // 批量设置 echarts resize
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -275,298 +275,322 @@ export const asyncRoutes = [
  //     }
  //   ]
  // },
-  {
-    path: '/organization',
-    component: layout,
-    meta: {
-      title: '大机构管理',
-      roles: ['MG'],
-      isHide: true
-    },
-    redirect: '/organization/big_organization',
-    children: [
-      {
-        path: '/organization/big_organization',
-        component: () => import('@/views/organization/big_organization.vue'),
-        meta: {
-          title: '大机构',
-          icon: 'Tickets'
-        }
-      },
-      {
-        path: '/organization/big_organization/agent_detail',
-        name: 'agent_detail',
-        component: () => import('@/views/organization/agent_detail.vue'),
-        meta: {
-          title: '机构详情',
-          isHide: true,
-          activeMenu: '/organization/big_organization'
-        }
-      }
-    ]
-  },
-  {
-    path: '/mini_organization_manage',
-    component: layout,
-    meta: {
-      title: '小机构管理',
-      roles: ['FO'],
-      isHide: true
-    },
-    redirect: '/mini_organization_manage/mini_organization',
-    children: [
-      {
-        path: '/mini_organization/mini_organization',
-        component: () => import('@/views/organization/mini_organization.vue'),
-        meta: {
-          title: '小机构',
-          icon: 'SetUp'
-        }
-      },
-      {
-        path: '/organization/mini_organization/mini_agent_detail',
-        name: 'mini_agent_detail',
-        component: () => import('@/views/organization/mini_agent_detail.vue'),
-        meta: {
-          title: '小机构详情',
-          isHide: true,
-          activeMenu: '/mini_organization/mini_organization'
-        }
-      }
-    ]
-  },
-  {
-    path: '/agent_manage',
-    component: layout,
-    meta: {
-      title: '大代理管理',
-      roles: ['FO', 'SO'],
-      isHide: true
-    },
-    redirect: '/agent_manage/agent_list',
-    children: [
-      {
-        path: '/agent_manage/agent_list',
-        component: () => import('@/views/organization/agent_list.vue'),
-        meta: {
-          title: '大代理',
-          icon: 'Discount'
-        }
-      }
-    ]
-  },
-  {
-    path: '/promotion_manage',
-    component: layout,
-    meta: {
-      title: '代理',
-      icon: 'Connection',
-    },
-    redirect: '/promotion_manage/one_promotion_list',
-    children: [
-      {
-        path: '/promotion_manage/one_promotion_list',
-        component: () => import('@/views/organization/one_promotion_list.vue'),
-        meta: {
-          title: '一级代理',
-          icon: 'User',
-          roles: ['FO', 'SO', 'AG']
-        }
-      },
-      {
-        path: '/promotion_manage/two_promotion_list',
-        component: () => import('@/views/organization/two_promotion_list.vue'),
-        meta: {
-          title: '二级代理',
-          icon: 'User',
-          roles: ['FO', 'SO', 'AG', 'FB']
-        }
-      }
-    ]
-  },
+  // {
+  //   path: '/organization',
+  //   component: layout,
+  //   meta: {
+  //     title: '大机构管理',
+  //     // roles: ['MG'],
+  //     isHide: true
+  //   },
+  //   redirect: '/organization/big_organization',
+  //   children: [
+  //     {
+  //       path: '/organization/big_organization',
+  //       component: () => import('@/views/organization/big_organization.vue'),
+  //       meta: {
+  //         title: '大机构',
+  //         icon: 'Tickets'
+  //       }
+  //     },
+  //     {
+  //       path: '/organization/big_organization/agent_detail',
+  //       name: 'agent_detail',
+  //       component: () => import('@/views/organization/agent_detail.vue'),
+  //       meta: {
+  //         title: '机构详情',
+  //         isHide: true,
+  //         activeMenu: '/organization/big_organization'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/mini_organization_manage',
+  //   component: layout,
+  //   meta: {
+  //     title: '小机构管理',
+  //     // roles: ['FO'],
+  //     isHide: true
+  //   },
+  //   redirect: '/mini_organization_manage/mini_organization',
+  //   children: [
+  //     {
+  //       path: '/mini_organization/mini_organization',
+  //       component: () => import('@/views/organization/mini_organization.vue'),
+  //       meta: {
+  //         title: '小机构',
+  //         icon: 'SetUp'
+  //       }
+  //     },
+  //     {
+  //       path: '/organization/mini_organization/mini_agent_detail',
+  //       name: 'mini_agent_detail',
+  //       component: () => import('@/views/organization/mini_agent_detail.vue'),
+  //       meta: {
+  //         title: '小机构详情',
+  //         isHide: true,
+  //         activeMenu: '/mini_organization/mini_organization'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/agent_manage',
+  //   component: layout,
+  //   meta: {
+  //     title: '大代理管理',
+  //     // roles: ['FO', 'SO'],
+  //     isHide: true
+  //   },
+  //   redirect: '/agent_manage/agent_list',
+  //   children: [
+  //     {
+  //       path: '/agent_manage/agent_list',
+  //       component: () => import('@/views/organization/agent_list.vue'),
+  //       meta: {
+  //         title: '大代理',
+  //         icon: 'Discount'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/promotion_manage',
+  //   component: layout,
+  //   meta: {
+  //     title: '代理',
+  //     icon: 'Connection',
+  //   },
+  //   redirect: '/promotion_manage/one_promotion_list',
+  //   children: [
+  //     {
+  //       path: '/promotion_manage/one_promotion_list',
+  //       component: () => import('@/views/organization/one_promotion_list.vue'),
+  //       meta: {
+  //         title: '一级代理',
+  //         icon: 'User',
+  //         // roles: ['FO', 'SO', 'AG']
+  //       }
+  //     },
+  //     {
+  //       path: '/promotion_manage/two_promotion_list',
+  //       component: () => import('@/views/organization/two_promotion_list.vue'),
+  //       meta: {
+  //         title: '二级代理',
+  //         icon: 'User',
+  //         // roles: ['FO', 'SO', 'AG', 'FB']
+  //       }
+  //     }
+  //   ]
+  // },
  {
    path: '/shop_manage',
    component: layout,
    meta: {
-      title: '商家管理',
-      roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
+      title: '商户信息',
+      // roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
      icon: 'Handbag'
    },
    redirect: '/shop_manage/shop_list',
    children: [
-      {
-        path: '/shop_manage/shop_list',
-        name: 'shop_list',
-        component: () => import('@/views/organization/shop_list.vue'),
-        meta: {
-          title: '商家列表',
-          icon: 'Tickets'
-        }
-      },
+      // {
+      //   path: '/shop_manage/shop_list',
+      //   name: 'shop_list',
+      //   component: () => import('@/views/organization/shop_list.vue'),
+      //   meta: {
+      //     title: '商家列表',
+      //     icon: 'Tickets'
+      //   }
+      // },
      {
        path: '/shop_manage/shop_detail',
        name: 'shop_detail',
        component: () => import('@/views/organization/shop_detail.vue'),
        meta: {
-          title: '详情',
-          isHide: true,
-          activeMenu: '/shop_manage/shop_list'
+          title: '基础信息',
+          icon: 'Tickets'
        }
      },
      {
-        path: '/shop_manage/maker_apply',
-        component: () => import('@/views/organization/maker_apply.vue'),
+        path: '/shop_manage/appkey',
+        component: () => import('@/views/organization/appkey.vue'),
        meta: {
-          title: '创客申请',
-          icon: 'User'
+          title: '支付参数',
+          icon: 'Connection'
+        }
+      }
+    ]
+  },
+  {
+    path: '/order',
+    component: layout,
+    meta: {
+      title: '订单管理',
+      // roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
+      icon: 'Handbag',
+      isHide: true
+    },
+    redirect: '/order/order_list',
+    children: [
+      {
+        path: '/order/order_list',
+        name: 'order_list',
+        component: () => import('@/views/order/order_list.vue'),
+        meta: {
+          title: '订单列表',
+          icon: 'Tickets'
        }
      },
-      // {
-      //   path: '/shop_manage/cashier_dot',
-      //   component: () => import('@/views/organization/cashier_dot.vue'),
-      //   meta: {
-      //     title: '收银点列表',
-      //     icon: 'PieChart',
-      //     roles: ['MG']
-      //   }
-      // },
-      {
-        path: '/shop_manage/cashierdot_detail',
-        name: 'cashierdot_detail',
-        component: () => import('@/views/organization/cashierdot_detail.vue'),
-        meta: {
-          title: '详情',
-          isHide: true,
-          activeMenu: '/shop_manage/cashier_dot'
-        }
-      }
    ]
  },
  {
-    path: '/withdraw_manage',
+    path: '/doc',
    component: layout,
    meta: {
-      title: '提现管理',
-      roles: ['FO', 'SO'],
+      title: '开发文档',
+      // roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
+      icon: 'Handbag',
      isHide: true
    },
-    redirect: '/withdraw_manage/withdraw_list',
+    redirect: '/doc/doc_detail',
    children: [
      {
-        path: '/withdraw_manage/withdraw_list',
-        component: () => import('@/views/withdraw/withdraw_list.vue'),
+        path: '/doc/doc_detail',
+        name: 'doc_detail',
+        component: () => import('@/views/doc/doc_detail.vue'),
        meta: {
-          title: '提现申请',
-          icon: 'CreditCard'
+          title: '开发文档',
+          icon: 'Document'
        }
-      }
-    ]
-  },
-  {
-    path: '/device_manage',
-    component: layout,
-    meta: {
-      title: '设备管理',
-      isHide: true
-    },
-    redirect: '/device_manage/device_list',
-    children: [
-      {
-        path: '/device_manage/device_list',
-        component: () => import('@/views/device/device_list.vue'),
-        meta: {
-          title: '设备列表',
-          icon: 'TakeawayBox'
-        }
-      }
-    ]
-  },
-  {
-    path: '/total_earnings',
-    component: layout,
-    meta: {
-      title: '累计收益管理',
-      isHide: true
-    },
-    redirect: '/total_earnings/total_earnings_list',
-    children: [
-      {
-        path: '/total_earnings/total_earnings_list',
-        component: () => import('@/views/total_earnings/total_earnings_list.vue'),
-        meta: {
-          title: '累计收益',
-          icon: 'Coin'
-        }
-      }
-    ]
-  },
-  {
-    path: '/promotion',
-    component: layout,
-    meta: {
-      title: '推广图片管理',
-      isHide: true,
-      roles: ['MG']
-    },
-    redirect: '/promotion/promotion_list',
-    children: [
-      {
-        path: '/promotion/promotion_list',
-        component: () => import('@/views/promotion/promotion_list.vue'),
-        meta: {
-          title: '推广图片',
-          icon: 'PictureRounded'
-        }
-      }
-    ]
-  },
-  {
-    path: '/app_manage',
-    component: layout,
-    meta: {
-      title: 'APP管理',
-      icon: 'Iphone',
-      roles: ['MG']
-    },
-    redirect: '/app_manage/menu_list',
-    children: [
-      {
-        path: '/app_manage/menu_list',
-        component: () => import('@/views/app_manage/menu_list.vue'),
-        meta: {
-          title: '菜单管理',
-          icon: 'Tickets'
-        }
-      }
-    ]
-  },
-  {
-    path: '/setting',
-    component: layout,
-    meta: {
-      title: '系统设置',
-      icon: 'Setting',
-      roles: ['MG']
-    },
-    redirect: '/setting/appid_manage',
-    children: [
-      {
-        path: '/setting/appid_manage',
-        component: () => import('@/views/setting/appid_manage.vue'),
-        meta: {
-          title: 'Appid管理',
-          icon: 'Tickets'
-        }
-      }
+      },
    ]
  },
+  // {
+  //   path: '/withdraw_manage',
+  //   component: layout,
+  //   meta: {
+  //     title: '提现管理',
+  //     // roles: ['FO', 'SO'],
+  //     isHide: true
+  //   },
+  //   redirect: '/withdraw_manage/withdraw_list',
+  //   children: [
+  //     {
+  //       path: '/withdraw_manage/withdraw_list',
+  //       component: () => import('@/views/withdraw/withdraw_list.vue'),
+  //       meta: {
+  //         title: '提现申请',
+  //         icon: 'CreditCard'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/device_manage',
+  //   component: layout,
+  //   meta: {
+  //     title: '设备管理',
+  //     isHide: true
+  //   },
+  //   redirect: '/device_manage/device_list',
+  //   children: [
+  //     {
+  //       path: '/device_manage/device_list',
+  //       component: () => import('@/views/device/device_list.vue'),
+  //       meta: {
+  //         title: '设备列表',
+  //         icon: 'TakeawayBox'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/total_earnings',
+  //   component: layout,
+  //   meta: {
+  //     title: '累计收益管理',
+  //     isHide: true
+  //   },
+  //   redirect: '/total_earnings/total_earnings_list',
+  //   children: [
+  //     {
+  //       path: '/total_earnings/total_earnings_list',
+  //       component: () => import('@/views/total_earnings/total_earnings_list.vue'),
+  //       meta: {
+  //         title: '累计收益',
+  //         icon: 'Coin'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/promotion',
+  //   component: layout,
+  //   meta: {
+  //     title: '推广图片管理',
+  //     isHide: true,
+  //     // roles: ['MG']
+  //   },
+  //   redirect: '/promotion/promotion_list',
+  //   children: [
+  //     {
+  //       path: '/promotion/promotion_list',
+  //       component: () => import('@/views/promotion/promotion_list.vue'),
+  //       meta: {
+  //         title: '推广图片',
+  //         icon: 'PictureRounded'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/app_manage',
+  //   component: layout,
+  //   meta: {
+  //     title: 'APP管理',
+  //     icon: 'Iphone',
+  //     // roles: ['MG']
+  //   },
+  //   redirect: '/app_manage/menu_list',
+  //   children: [
+  //     {
+  //       path: '/app_manage/menu_list',
+  //       component: () => import('@/views/app_manage/menu_list.vue'),
+  //       meta: {
+  //         title: '菜单管理',
+  //         icon: 'Tickets'
+  //       }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/setting',
+  //   component: layout,
+  //   meta: {
+  //     title: '系统设置',
+  //     icon: 'Setting',
+  //     // roles: ['MG']
+  //   },
+  //   redirect: '/setting/appid_manage',
+  //   children: [
+  //     {
+  //       path: '/setting/appid_manage',
+  //       component: () => import('@/views/setting/appid_manage.vue'),
+  //       meta: {
+  //         title: 'Appid管理',
+  //         icon: 'Tickets'
+  //       }
+  //     }
+  //   ]
+  // },
  {
    path: '/notice',
    component: layout,
    meta: {
      title: '消息管理',
      isHide: true,
-      roles: ['MG']
+      // roles: ['MG']
    },
    redirect: '/notice/index',
    children: [
--- a/src/store/configure.js
+++ b/src/store/configure.js
@@ -4,7 +4,7 @@ import { ENUMS } from "@/utils/enums.js";
 export const useConfigure = defineStore("useConfigure", {
  state: () => {
    return {
-      projectName: '银收客机构管理端',
+      projectName: '银收客开放平台',
      defaultActive: "/home", // 默认选中的菜单
      configure: {
        // ---------- 主题 ----------
--- a/src/views/doc/doc_detail.vue
+++ b/src/views/doc/doc_detail.vue
@@ -0,0 +1,13 @@
+<template>
+    <iframe src="https://openplat.sxczgkj.cn/" class="iframe"></iframe>
+</template>
+
+<style scoped lang="scss">
+.iframe {
+    border: none;
+    width: 100%;
+    height: 99%;
+    border-radius: 14px;
+    box-sizing: border-box;
+}
+</style>
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -9,7 +9,7 @@
          <img class="img" src="../assets/home_icon1.png">
        </div>
        <div class="info">
-          <div class="title">团队总流水</div>
+          <div class="title">今日收款</div>
          <div class="num">
            <count-to :start-val="0" :decimals="2" :end-val="homeData.sumConsumeFee" :duration="1000" />
            <!-- {{ homeData.sumConsumeFee }} -->
@@ -22,14 +22,14 @@
          <img class="img" src="../assets/home_icon2.png">
        </div>
        <div class="info">
-          <div class="title">总收益</div>
+          <div class="title">总收款</div>
          <div class="num">
            <count-to :start-val="0" :decimals="2" :end-val="homeData.sumfansShareMoney" :duration="1000" />
            <span class="i">元</span>
          </div>
        </div>
      </div>
-      <div class="item">
+      <!-- <div class="item">
        <div class="icon">
          <img class="img" src="../assets/home_icon3.png">
        </div>
@@ -40,8 +40,8 @@
            <span class="i">元</span>
          </div>
        </div>
-      </div>
-      <div class="item">
+      </div> -->
+      <!-- <div class="item">
        <div class="icon">
          <img class="img" src="../assets/home_icon4.png">
        </div>
@@ -52,7 +52,7 @@
            <span class="i">%</span>
          </div>
        </div>
-      </div>
+      </div> -->
    </div>
  </div>
  <div class="card mt15">
@@ -61,7 +61,7 @@
 </template>

 <script setup>
-import { getIndexData } from '@/api/home.js'
+import { getIndexData, querySumAmount } from '@/api/home.js'
 import { useUser } from "@/store/user.js";
 import chartCard from '@/components/chartCard.vue';

@@ -77,9 +77,9 @@ let homeData = reactive({
 // 获取首页数据
 async function getIndexDataHandle() {
  try {
-    const res = await getIndexData()
-    homeData.sumConsumeFee = res.sumConsumeFee
-    homeData.sumfansShareMoney = res.sumfansShareMoney
+    const res = await querySumAmount()
+    homeData.sumConsumeFee = res.yestedayAmount
+    homeData.sumfansShareMoney = res.sumAmount
    homeData.yestedayShareMoney = res.yestedayShareMoney
    homeData.currentFee = res.currentFee
  } catch (error) {
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -2,7 +2,7 @@
  <div class="login-case">
    <div class="form-case">
      <span class="Hello">Hello !</span>
-      <span class="title">欢迎来到银收客</span>
+      <span class="title">欢迎来到银收客开放平台</span>
      <el-form ref="ruleFormRef" :rules="rules" :model="form">
        <el-form-item prop="loginName">
          <el-input class="inp" v-model="form.loginName" clearable autocomplete="new-password" size="large"
@@ -12,13 +12,13 @@
          <el-input class="inp" v-model="form.password" clearable autocomplete="new-password" size="large" type="password"
            :prefix-icon="Lock" placeholder="请输入密码" style="width: 100%;" />
        </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
          <el-select v-model="form.userType" placeholder="请选择机构类型" size="large" style="width: 100%;">
            <el-option key="MG" label="平台" value="MG"></el-option>
            <el-option key="FO" label="大机构" value="FO"></el-option>
            <el-option key="SO" label="小机构" value="SO"></el-option>
          </el-select>
-        </el-form-item>
+        </el-form-item> -->
        <!-- <el-form-item prop="code">
          <div class="code-case">
            <el-input class="inp" v-model="form.code" clearable autocomplete="new-password" size="large"
@@ -65,7 +65,7 @@ function getCode(code) {
 const form = reactive({
  loginName: "",
  password: "",
-  userType: 'MG',
+  userType: 'MC',
  code: "",
 });
 /**
--- a/src/views/order/order_list.vue
+++ b/src/views/order/order_list.vue
@@ -0,0 +1,272 @@
+<template>
+    <div class="card">
+        <el-space>
+            <el-input v-model="tableOptions.orderNo" placeholder="请输入订单号" style="width: 200px;" />
+            <el-select v-model="tableOptions.status" placeholder="请选择状态">
+                <el-option :label="item.label" :value="item.state" v-for="item in status" :key="item.state"></el-option>
+            </el-select>
+            <el-select v-model="tableOptions.payType" placeholder="请选择支付类型">
+                <el-option :label="item.label" :value="item.key" v-for="item in payTypes" :key="item.key"></el-option>
+            </el-select>
+            <el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
+            <el-button icon="RefreshRight" @click="resizeTable">重置</el-button>
+        </el-space>
+        <div class="table mt15">
+            <el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
+                <el-table-column prop="amount" label="金额">
+                    <template #default="scope">
+                        ￥{{ scope.row.amount }}
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column prop="orderType" label="订单类型">
+                    <template #default="scope">
+                        <span v-if="scope.row.orderType == 1">反扫收款</span>
+                        <span v-if="scope.row.orderType == 2">收款码</span>
+                        <span v-if="scope.row.orderType == 3">会员充值</span>
+                        <span v-if="scope.row.orderType == 4">POS</span>
+                        <span v-if="scope.row.orderType == 5">反扫会员充值</span>
+                        <span v-if="scope.row.orderType == 6">扫码王、QR68机具收款</span>
+                        <span v-if="scope.row.orderType == 7">H5</span>
+                        <span v-if="scope.row.orderType == 8">升级收费</span>
+                        <span v-if="scope.row.orderType == 9">小程序</span>
+                        <span v-if="scope.row.orderType == 10">小程序线上店订单</span>
+                        <span v-if="scope.row.orderType == 11">缴费通</span>
+                        <span v-if="scope.row.orderType == 99">插件</span>
+                    </template>
+                </el-table-column> -->
+                <!-- <el-table-column prop="merchantCode" label="商户号"></el-table-column> -->
+                <el-table-column prop="orderNo" label="订单号"></el-table-column>
+                <el-table-column prop="transNo" label="三方订单号"></el-table-column>
+                <el-table-column prop="appletsAppId" label="小程序appid"></el-table-column>
+                <el-table-column prop="payType" label="支付类型">
+                    <template #default="scope">
+                        {{ filterPayType(scope.row.payType) }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status" label="状态">
+                    <template #default="scope">
+                        <el-tag type="info" disable-transitions round v-if="scope.row.status == 0">交易失败</el-tag>
+                        <el-tag type="success" disable-transitions round v-if="scope.row.status == 1">交易成功</el-tag>
+                        <el-tag type="danger" disable-transitions round v-if="scope.row.status == 2">退款成功</el-tag>
+                        <el-tag type="danger" disable-transitions round v-if="scope.row.status == 3">退款失败</el-tag>
+                        <el-tag type="danger" disable-transitions round v-if="scope.row.status == 4">退款中</el-tag>
+                        <el-tag type="danger" disable-transitions round v-if="scope.row.status == 5">待付款</el-tag>
+                        <el-tag type="danger" disable-transitions round v-if="scope.row.status == 6">部分退款</el-tag>
+                        <el-tag type="warning" disable-transitions round v-if="scope.row.status == 7">待支付</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="orderInfo" label="订单备注"></el-table-column>
+                <el-table-column prop="transTime" label="支付时间">
+                    <template #default="scope">
+                        {{ scope.row.transTime && dayjs(scope.row.transTime).format('YYYY-MM-DD HH:mm:ss') }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createTime" label="创建时间">
+                    <template #default="scope">
+                        <el-text>{{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</el-text>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column label="操作" width="120">
+                    <template #default="scope">
+                        <template v-if="scope.row.status == 0">
+                            <el-popconfirm title="是否通过审核？" width="200" confirm-button-text="通过" cancel-button-text="驳回"
+                                @cancel="checkHandle(scope.row, 5)" @confirm="checkHandle(scope.row, 1)">
+                                <template #reference>
+                                    <el-button type="primary" size="small" icon="EditPen">待审核</el-button>
+                                </template>
+                            </el-popconfirm>
+                        </template>
+                        <template v-else>
+                            <el-button type="default" size="small" icon="EditPen" disabled v-if="scope.row.status == 1">
+                                已通过
+                            </el-button>
+                            <el-button type="default" size="small" icon="EditPen" disabled v-if="scope.row.status == 5">
+                                已驳回
+                            </el-button>
+                        </template>
+                    </template>
+                </el-table-column> -->
+            </el-table>
+        </div>
+        <div class="mt15">
+            <el-pagination layout="prev, pager, next, total, sizes, jumper" background
+                v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSize"
+                :page-size="tableOptions.pageSize" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
+                @size-change="paginationChange" @current-change="paginationChange" />
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { onMounted, ref } from 'vue';
+import { dayjs, ElMessage } from 'element-plus';
+import { queryOrder } from '@/api/shop.js'
+
+const payTypes = ref([
+    {
+        key: 'alipay',
+        label: '支付宝App支付'
+    },
+    {
+        key: 'alipay_qr',
+        label: '支付宝正扫'
+    },
+    {
+        key: 'alipay_wap',
+        label: '支付宝H5支付'
+    },
+    {
+        key: 'alipay_lite',
+        label: '支付宝小程序支付'
+    },
+    {
+        key: 'alipay_pub',
+        label: '支付宝生活号支付'
+    },
+    {
+        key: 'alipay_scan',
+        label: '支付宝反扫'
+    },
+    {
+        key: 'wx_pub',
+        label: '微信公众号支付'
+    },
+    {
+        key: 'wx_lite',
+        label: '微信小程序支付'
+    },
+    {
+        key: 'wx_scan',
+        label: '微信反扫'
+    },
+    {
+        key: 'union',
+        label: '银联云闪付App'
+    },
+    {
+        key: 'union_qr',
+        label: '银联云闪付正扫'
+    },
+    {
+        key: 'union_wap',
+        label: '银联云闪付H5支付'
+    },
+    {
+        key: 'union_scan',
+        label: '银联云闪付反扫'
+    },
+    {
+        key: 'union_online',
+        label: '银联H5支付'
+    },
+    {
+        key: 'union_checkout',
+        label: '银联统一收银台支付'
+    },
+    {
+        key: 'fast_pay',
+        label: '快捷支付'
+    },
+    {
+        key: 'b2c',
+        label: '个人网银支付'
+    }
+])
+
+const status = ref([
+    {
+        state: 0,
+        label: '交易失败'
+    },
+    {
+        state: 1,
+        label: '交易成功'
+    },
+    {
+        state: 2,
+        label: '退款成功'
+    },
+    {
+        state: 3,
+        label: '退款失败'
+    },
+    {
+        state: 4,
+        label: '退款中'
+    },
+    // {
+    //     state: 5,
+    //     label: '待付款'
+    // },
+    {
+        state: 6,
+        label: '部分退款'
+    },
+    {
+        state: 7,
+        label: '待支付'
+    }
+])
+
+const table = ref(null)
+
+function filterPayType(type) {
+    return type ? payTypes.value.find(item => item.key == type).label : type
+}
+
+// 表格参数
+const tableOptions = reactive({
+    loading: true,
+    status: '',
+    orderNo: '',
+    payType: '',
+    list: [],
+    total: 0,
+    pageNum: 1,
+    pageSize: 10
+})
+
+// 重置表格
+function resizeTable() {
+    tableOptions.orderNo = ''
+    tableOptions.status = ''
+    tableOptions.payType = ''
+    searchHandle()
+}
+
+// 搜索
+function searchHandle() {
+    tableOptions.pageNum = 1;
+    paginationChange()
+}
+
+// 分页回调
+function paginationChange() {
+    tableOptions.loading = true
+    getUserMarkAjax()
+}
+
+async function getUserMarkAjax() {
+    try {
+        const res = await queryOrder({
+            page: tableOptions.pageNum,
+            pageSize: tableOptions.pageSize,
+            orderNo: tableOptions.orderNo,
+            status: tableOptions.status,
+            payType: tableOptions.payType
+        })
+        tableOptions.loading = false
+        tableOptions.list = res.list
+        tableOptions.total = res.total
+        table.value.setScrollTop(0)
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+onMounted(() => {
+    getUserMarkAjax()
+})
+</script>
+
+<style scoped lang="scss"></style>
--- a/src/views/organization/appkey.vue
+++ b/src/views/organization/appkey.vue
@@ -0,0 +1,149 @@
+<template>
+    <div class="card">
+        <!-- <el-space>
+            <el-input v-model="tableOptions.phone" placeholder="请输入手机号" style="width: 200px;" />
+            <el-input v-model="tableOptions.name" placeholder="请输入姓名" style="width: 200px;" />
+            <el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
+            <el-button icon="RefreshRight" @click="resizeTable">重置</el-button>
+        </el-space> -->
+        <div class="table mt15">
+            <el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
+                <el-table-column prop="organNo" label="商户号"></el-table-column>
+                <el-table-column prop="privateKey" label="私钥">
+                    <template #default="scope">
+                        <el-tooltip>
+                            <template #content>
+                                <div class="content">点击复制：{{ scope.row.privateKey }}</div>
+                            </template>
+                            <el-text line-clamp="1" type="primary" @click="copy(scope.row.privateKey)">{{
+                                scope.row.privateKey }}</el-text>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="publicKey" label="公钥">
+                    <template #default="scope">
+                        <el-tooltip>
+                            <template #content>
+                                <div class="content">点击复制：{{ scope.row.publicKey }}</div>
+                            </template>
+                            <el-text line-clamp="1" type="primary" @click="copy(scope.row.publicKey)">{{ scope.row.publicKey
+                            }}</el-text>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status" label="状态">
+                    <template #default="scope">
+                        <el-tag type="success" disable-transitions round v-if="scope.row.status == 0">正常</el-tag>
+                        <el-tag type="info" disable-transitions round v-if="scope.row.status == 1">禁用</el-tag>
+                        <el-tag type="warning" disable-transitions round v-if="scope.row.status == 2">待激活</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createTime" label="更新时间">
+                    <template #default="scope">
+                        <el-text>{{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</el-text>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column label="操作" width="120">
+                    <template #default="scope">
+                        <template v-if="scope.row.status == 0">
+                            <el-popconfirm title="是否通过审核？" width="200" confirm-button-text="通过" cancel-button-text="驳回"
+                                @cancel="checkHandle(scope.row, 5)" @confirm="checkHandle(scope.row, 1)">
+                                <template #reference>
+                                    <el-button type="primary" size="small" icon="EditPen">待审核</el-button>
+                                </template>
+                            </el-popconfirm>
+                        </template>
+                        <template v-else>
+                            <el-button type="default" size="small" icon="EditPen" disabled v-if="scope.row.status == 1">
+                                已通过
+                            </el-button>
+                            <el-button type="default" size="small" icon="EditPen" disabled v-if="scope.row.status == 5">
+                                已驳回
+                            </el-button>
+                        </template>
+                    </template>
+                </el-table-column> -->
+            </el-table>
+        </div>
+        <div class="mt15">
+            <el-pagination layout="prev, pager, next, total, sizes, jumper" background
+                v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie"
+                :page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
+                @size-change="paginationChange" @current-change="paginationChange" />
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+import { dayjs, ElMessage } from 'element-plus';
+import useClipboard from 'vue-clipboard3'
+import { getUserMark, updateUserMark, queryOrgan } from '@/api/shop.js'
+const { toClipboard } = useClipboard()
+
+const table = ref(null)
+
+
+// 表格参数
+const tableOptions = reactive({
+    loading: true,
+    phone: '',
+    name: '',
+    list: [],
+    total: 0,
+    pageNum: 1,
+    pageSize: 10
+})
+
+// 复制
+async function copy(text) {
+    try {
+        await toClipboard(text)
+        ElMessage.success('复制成功')
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+// 重置表格
+function resizeTable() {
+    tableOptions.phone = ''
+    tableOptions.name = ''
+    searchHandle()
+}
+
+// 搜索
+function searchHandle() {
+    tableOptions.pageNum = 1;
+    paginationChange()
+}
+
+// 分页回调
+function paginationChange() {
+    tableOptions.loading = true
+    getUserMarkAjax()
+}
+
+// 获取创客审核列表
+async function getUserMarkAjax() {
+    try {
+        const res = await queryOrgan()
+        tableOptions.loading = false
+        tableOptions.list = [res]
+        tableOptions.total = 1
+        table.value.setScrollTop(0)
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+onMounted(() => {
+    getUserMarkAjax()
+})
+</script>
+
+<style scoped lang="scss">
+.content {
+    width: 300px;
+}
+</style>
--- a/src/views/organization/cashier_dot.vue
+++ b/src/views/organization/cashier_dot.vue
@@ -1,107 +0,0 @@
-<template>
-    <div class="card">
-        <el-space>
-            <el-input v-model="tableOptions.phone" placeholder="请输入手机号" style="width: 200px;" />
-            <el-input v-model="tableOptions.name" placeholder="请输入姓名" style="width: 200px;" />
-            <el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
-            <el-button icon="RefreshRight" @click="resizeTable">重置</el-button>
-        </el-space>
-        <div class="table mt15">
-            <el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
-                <el-table-column prop="name" label="收银点名称"></el-table-column>
-                <el-table-column prop="subcode" label="收银点code"></el-table-column>
-                <el-table-column prop="address" label="收银点地址"></el-table-column>
-                <el-table-column prop="masterName" label="店铺名称"></el-table-column>
-                <el-table-column label="操作" width="120">
-                    <template #default="scope">
-                        <RouterLink
-                            :to="{ name: 'cashierdot_detail', query: { id: scope.row.masterUserId, name: scope.row.name, account: scope.row.subcode, merchantcode: scope.row.masterCode } }">
-                            <el-button type="primary" size="small" icon="Search" v-permission="['MG']">
-                                商户详情
-                            </el-button>
-                        </RouterLink>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="mt15">
-            <el-pagination layout="prev, pager, next, total, sizes, jumper" background
-                v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie"
-                :page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
-                @size-change="paginationChange" @current-change="paginationChange" />
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { onMounted } from 'vue';
-import { dayjs, ElMessage } from 'element-plus';
-import { queryMerchantCashPlace } from '@/api/shop.js'
-
-const table = ref(null)
-
-
-// 表格参数
-const tableOptions = reactive({
-    loading: true,
-    phone: '',
-    name: '',
-    list: [],
-    total: 0,
-    pageNum: 1,
-    pageSize: 10
-})
-
-// 重置表格
-function resizeTable() {
-    tableOptions.phone = ''
-    tableOptions.name = ''
-    searchHandle()
-}
-
-// 搜索
-function searchHandle() {
-    tableOptions.pageNum = 1;
-    paginationChange()
-}
-
-// 分页回调
-function paginationChange() {
-    tableOptions.loading = true
-    getUserMarkAjax()
-}
-
-// 审核
-async function checkHandle(row, type) {
-    try {
-        await updateUserMark({
-            status: type,
-            id: row.userId,
-            remark: ''
-        })
-        ElMessage.success('提交成功')
-        resizeTable()
-    } catch (error) {
-    }
-}
-
-// 获取创客审核列表
-async function getUserMarkAjax() {
-    try {
-        const res = await queryMerchantCashPlace({
-            pageNum: tableOptions.pageNum,
-            pageSzie: tableOptions.pageSize
-        })
-        tableOptions.loading = false
-        tableOptions.list = res.list
-        tableOptions.total = res.total
-        table.value.setScrollTop(0)
-    } catch (error) {
-        console.log(error);
-    }
-}
-
-onMounted(() => {
-    getUserMarkAjax()
-})
-</script>
--- a/src/views/organization/cashierdot_detail.vue
+++ b/src/views/organization/cashierdot_detail.vue
@@ -1,270 +0,0 @@
-<template>
-    <div class="card">
-        <div class="nav_wrap">
-            <el-radio-group v-model="type">
-                <el-radio-button :label="item.type" v-for="item in navs" :key="item.type">
-                    {{ item.label }}
-                </el-radio-button>
-            </el-radio-group>
-        </div>
-        <div class="container mt15">
-            <div class="compont_wrap">
-                <component :is="componentList[type]" />
-            </div>
-            <div class="shop_info">
-                <div class="header">
-                    <el-text size="large">商户关联信息</el-text>
-                </div>
-                <div class="title_wrap">
-                    <el-text>身份信息关联（进件成功的）商户数量</el-text>
-                </div>
-                <div class="content">
-                    <div class="row">
-                        <el-space>
-                            <el-text>实名身份证</el-text>
-                            <el-text type="warning" tag="ins">{{ authInfo.CertNoCount }}</el-text>
-                        </el-space>
-                    </div>
-                    <div class="row">
-                        <el-space>
-                            <el-text>结算身份证</el-text>
-                            <el-text type="warning" tag="ins">{{ authInfo.countMbiName }}</el-text>
-                        </el-space>
-                    </div>
-                    <div class="row">
-                        <el-space>
-                            <el-text>同名商户</el-text>
-                            <el-text type="warning" tag="ins">{{ authInfo.countAccountCount }}</el-text>
-                        </el-space>
-                    </div>
-                </div>
-                <div class="title_wrap">
-                    <el-text>用户IP记录</el-text>
-                </div>
-                <div class="mt15">
-                    <el-table :data="tableOptions.list" border height="200" v-loading="tableOptions.loading">
-                        <el-table-column prop="ip" label="IP地址"></el-table-column>
-                        <el-table-column prop="remark" label="操作"></el-table-column>
-                        <el-table-column prop="createtime" label="操作时间">
-                            <template #default="scope">
-                                {{ dayjs(scope.row.createtime).format('YYYY-MM-DD HH:mm:ss') }}
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                    <div class="mt15">
-                        <el-pagination layout="prev, pager, next, total, sizes, jumper" background
-                            v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie" small
-                            :page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
-                            @size-change="paginationChange" @current-change="paginationChange" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { connectInfo, merchBaseInfo, merchantInfoDetail, merchBaseAccount, messageChannel, userIpPage, merchLicense } from '@/api/shop.js'
-
-import authentication from './components/authentication.vue'
-import shopInfo from './components/shopInfo.vue'
-import settleInfo from './components/settleInfo.vue'
-import aisleInfo from './components/aisleInfo.vue'
-import businessLicense from './components/businessLicense.vue'
-
-import { useRoute } from 'vue-router'
-import { reactive } from 'vue'
-import { dayjs } from 'element-plus'
-const route = useRoute()
-
-const authInfo = ref({})
-
-const type = ref(1)
-
-const componentList = {
-    1: authentication,
-    2: shopInfo,
-    3: businessLicense,
-    4: settleInfo,
-    5: aisleInfo
-}
-
-const navs = reactive([])
-
-// 表格参数
-const tableOptions = reactive({
-    loading: true,
-    list: [],
-    total: 0,
-    pageNum: 1,
-    pageSzie: 10
-})
-
-// 分页回调
-function paginationChange() {
-    tableOptions.loading = true
-    userIpPageAjax()
-}
-
-// 实名认证信息页面(实名个数)
-async function connectInfoAjax() {
-    try {
-        const res = await connectInfo(route.query.id)
-        authInfo.value = res
-    } catch (error) {
-        console.log('实名认证信息页面error：', error)
-    }
-}
-
-// ip记录
-async function userIpPageAjax() {
-    try {
-        const res = await userIpPage({
-            userId: route.query.id,
-            currPage: tableOptions.pageNum,
-            size: tableOptions.pageSzie
-        })
-        tableOptions.loading = false
-        tableOptions.list = res.list
-        tableOptions.total = res.total
-    } catch (error) {
-        console.log('ip记录', error)
-    }
-}
-
-// 实名认证信息
-async function merchantInfoDetailAjax() {
-    try {
-        const res = await merchantInfoDetail(route.query.id)
-        if (res.bankCard.bankname) {
-            navs.push(
-                {
-                    type: 1,
-                    label: '实名认证信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.error('实名认证信息===', error)
-    }
-}
-
-// 商户基本信息
-async function merchBaseInfoAjax() {
-    try {
-        const res = await merchBaseInfo(route.query.id)
-        if (res.merchantBaseInfo.mccname) {
-            navs.push(
-                {
-                    type: 2,
-                    label: '商户基本信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('商户基本信息===', error)
-    }
-}
-
-// 营业执照信息
-async function merchLicenseAjax() {
-    try {
-        const res = await merchLicense(route.query.id)
-        if (res.license.principalperson) {
-            navs.push(
-                {
-                    type: 3,
-                    label: '营业执照信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('商户基本信息===', error)
-    }
-}
-
-// 结算信息
-async function merchBaseAccountAjax() {
-    try {
-        const res = await merchBaseAccount(route.query.id)
-        if (res.D0.bankCard) {
-            navs.push(
-                {
-                    type: 4,
-                    label: '结算信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('结算信息===', error)
-    }
-}
-
-// 通道进件信息
-async function messageChannelAjax() {
-    try {
-        const res = await messageChannel(route.query.id, route.query.merchantcode)
-        if (res.merchantChannelMessage.length) {
-            navs.push(
-                {
-                    type: 5,
-                    label: '通道进件信息'
-                }
-            )
-        }
-    } catch (error) {
-        console.log('通道进件信息===', error)
-    }
-}
-
-onMounted(async () => {
-    tableOptions.loading = false
-    connectInfoAjax()
-    userIpPageAjax()
-    await merchantInfoDetailAjax()
-    await merchBaseInfoAjax()
-    await merchLicenseAjax()
-    await merchBaseAccountAjax()
-    await messageChannelAjax()
-    type.value = navs[0].type
-    if (route.query.type && route.query.type == 'msg1') {
-        type.value = 5
-    }
-})
-</script>
-
-<style scoped lang="scss">
-@import './components/common.scss';
-
-.nav_wrap {
-    padding-bottom: 15px;
-    border-bottom: 1px solid #ececec;
-}
-
-.container {
-    display: flex;
-
-    .compont_wrap {
-        flex: 2;
-        padding-right: 20px;
-    }
-
-    .shop_info {
-        flex: 1;
-
-        .header {
-            padding-bottom: 14px;
-        }
-
-        .content {
-            padding: 14px 20px;
-
-            .row {
-                &:not(:first-child) {
-                    margin-top: 14px;
-                }
-            }
-        }
-    }
-}
-</style>
--- a/src/views/organization/components/aisleInfo.vue
+++ b/src/views/organization/components/aisleInfo.vue
@@ -26,11 +26,11 @@
                <el-input v-model="item.valid" disabled placeholder="请输入默认结算方式" style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信小程序appid">
-                <el-input v-model="item.wxLiteAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
+                <el-input v-model="item.wxLiteAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
                    style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信公众号appld">
-                <el-input v-model="item.wxPubAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
+                <el-input v-model="item.wxPubAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
                    style="width: 50%" />
            </el-form-item>
            <el-form-item label="微信公众号支付路径">
@@ -60,6 +60,9 @@ import { messageChannel, manualMerchantIncom } from '@/api/shop.js'
 import { useRoute } from 'vue-router'
 const route = useRoute()

+import { useUser } from "@/store/user.js";
+const storeUser = useUser();
+
 const reviewRemarks = ref([])
 const merchantChannels = ref([])
 const status = ref([
@@ -87,7 +90,7 @@ const loading = ref(false)
 // 通道进件信息
 async function messageChannelAjax() {
    try {
-        const res = await messageChannel(route.query.id)
+        const res = await messageChannel(storeUser.userInfo.userId)
        reviewRemarks.value = res.reviewRemarks
        merchantChannels.value = res.merchantChannels
        form.value = res.merchantChannelMessage
@@ -103,10 +106,10 @@ async function submitHandle(state, index) {
        await manualMerchantIncom({
            type: state,
            errMsg: form.value[index].remake || '',
-            userId: route.query.id,
+            userId: storeUser.userInfo.userId,
            channelId: form.value[index].channel || '',
-            wxLiteAppId: form.value[index].wxLiteAppId,
-            wxPubAppId: form.value[index].wxPubAppId,
+            wxLiteAppld: form.value[index].wxLiteAppld,
+            wxPubAppld: form.value[index].wxPubAppld,
            wxPubPath: form.value[index].wxPubPath
        })
        loading.value = false
--- a/src/views/organization/components/authentication.vue
+++ b/src/views/organization/components/authentication.vue
@@ -117,9 +117,9 @@
                </el-form-item>
            </el-col>
        </el-row>
-        <el-form-item>
+        <!-- <el-form-item>
            <el-button type="primary" @click="submitHandle">立即提交</el-button>
-        </el-form-item>
+        </el-form-item> -->
    </el-form>
 </template>

@@ -135,6 +135,9 @@ import { merchantInfoDetail, getBranchList, updatePromoterInformation } from '@/
 import { useRoute } from 'vue-router'
 const route = useRoute()

+import { useUser } from "@/store/user.js";
+const storeUser = useUser();
+
 const formRef = ref(null)
 const idCardRef1 = ref(null)
 const idCardRef2 = ref(null)
@@ -149,8 +152,8 @@ const gutter = ref(50)
 const form = reactive({
    status: '',
    id: '',
-    merchantcode: route.query.merchantcode,
-    userid: route.query.id,
+    merchantcode: storeUser.userInfo.merchantcode,
+    userid: storeUser.userInfo.userId,
    username: '',
    loginname: '',
    idCard: {},
@@ -213,7 +216,7 @@ async function submitHandle() {
 // 获取实名认证信息
 async function merchantInfoDetailAjax() {
    try {
-        const res = await merchantInfoDetail(route.query.id)
+        const res = await merchantInfoDetail(storeUser.userInfo.userId)
        await banknameChange(res.bankCard.bankname, res.bankCard.branchcity)
        form.id = res.id
        form.status = res.status
--- a/src/views/organization/components/businessLicense.vue
+++ b/src/views/organization/components/businessLicense.vue
@@ -9,7 +9,8 @@
            </el-col>
            <el-col :span="span">
                <el-form-item label="法人身份证号">
-                    <el-input v-model="form.idCard.certno" placeholder="请输入法人身份证号" @input="e => form.idCard.certno = removeSpaces(e)" />
+                    <el-input v-model="form.idCard.certno" placeholder="请输入法人身份证号"
+                        @input="e => form.idCard.certno = removeSpaces(e)" />
                </el-form-item>
            </el-col>
        </el-row>
@@ -30,12 +31,14 @@
        <el-row :gutter="gutter">
            <el-col :span="span">
                <el-form-item label="执照名称">
-                    <el-input v-model="form.license.bussauthname" placeholder="请输入执照名称" @input="e => form.license.bussauthname = removeSpaces(e)"  />
+                    <el-input v-model="form.license.bussauthname" placeholder="请输入执照名称"
+                        @input="e => form.license.bussauthname = removeSpaces(e)" />
                </el-form-item>
            </el-col>
            <el-col :span="span">
                <el-form-item label="工商注册号">
-                    <el-input v-model="form.license.bussauthnum" placeholder="请输入工商注册号" @input="e => form.license.bussauthnum = removeSpaces(e)" />
+                    <el-input v-model="form.license.bussauthnum" placeholder="请输入工商注册号"
+                        @input="e => form.license.bussauthnum = removeSpaces(e)" />
                </el-form-item>
            </el-col>
        </el-row>
@@ -93,6 +96,8 @@ import { merchLicense, updatemerchLicense } from '@/api/shop.js'

 import uploadCard from './uploadCard.vue'
 import { ElMessage } from 'element-plus'
+import { useUser } from "@/store/user.js";
+const storeUser = useUser();

 import { useRoute } from 'vue-router'
 const route = useRoute()
@@ -137,7 +142,7 @@ async function submitHandel() {
 // 营业执照信息
 async function merchLicenseAjax() {
    try {
-        const res = await merchLicense(route.query.id)
+        const res = await merchLicense(storeUser.userInfo.userId)
        form.license = res.license
        form.idCard = res.idCard
        uploadRef1.value.pselectFile({ url: form.license.licenseimage })
--- a/src/views/organization/components/settleInfo.vue
+++ b/src/views/organization/components/settleInfo.vue
@@ -1,7 +1,7 @@
 <!-- 结算信息 -->
 <template>
    <el-row :gutter="gutter">
-        <el-col :span="span">
+        <el-col :span="24">
            <el-form ref="d1FormRef" :model="d1Form" label-width="120" label-position="left">
                <div class="title_wrap">
                    <el-text>D1</el-text>
@@ -71,12 +71,12 @@
                    <uploadCard ref="d1BankRef5" @selectFile="file => d1Form.publicimage = file"
                        @removeFile="d1Form.publicimage = ''" />
                </el-form-item>
-                <el-form-item>
+                <!-- <el-form-item>
                    <el-button type="primary" @click="d1SubmitHandle">保存-D1</el-button>
-                </el-form-item>
+                </el-form-item> -->
            </el-form>
        </el-col>
-        <el-col :span="span">
+        <el-col :span="span" v-if="false">
            <el-form ref="d0FormRef" :model="d0Form" label-width="120" label-position="left">
                <div class="title_wrap">
                    <el-text>D0</el-text>
@@ -146,9 +146,9 @@
                    <uploadCard ref="d0BankRef5" @selectFile="file => d0Form.publicimage = file"
                        @removeFile="d0Form.publicimage = ''" />
                </el-form-item>
-                <el-form-item>
+                <!-- <el-form-item>
                    <el-button type="primary" @click="d0SubmitHandle">保存-D0</el-button>
-                </el-form-item>
+                </el-form-item> -->
            </el-form>
        </el-col>
    </el-row>
@@ -164,9 +164,9 @@
                </el-form-item>
            </el-col>
        </el-row>
-        <el-form-item>
+        <!-- <el-form-item>
            <el-button type="primary" @click="updateAuthenticationAjax" :loading="authFormLoading">保存认证信息</el-button>
-        </el-form-item>
+        </el-form-item> -->
    </el-form>
 </template>

@@ -183,6 +183,8 @@ import { merchBaseAccount, getBranchList, updateAccount, authentication, updateA
 import { useRoute } from 'vue-router'
 import { ElMessage } from 'element-plus';
 const route = useRoute()
+import { useUser } from "@/store/user.js";
+const storeUser = useUser();

 const span = ref(12)
 const gutter = ref(50)
@@ -196,7 +198,7 @@ const d1BankRef4 = ref(null)
 const d1BankRef5 = ref(null)
 const bankBranchs = ref([])
 const d1Form = reactive({
-    userid: route.query.id,
+    userid: storeUser.userInfo.userId,
    channeltype: 'D1',
    bankCard: {},
    idcard: {},
@@ -268,7 +270,7 @@ const d0BankRef4 = ref(null)
 const d0BankRef5 = ref(null)
 const d0FormRef = ref(null)
 const d0Form = reactive({
-    userid: route.query.id,
+    userid: storeUser.userInfo.userId,
    channeltype: 'D0',
    bankCard: {},
    idcard: {},
@@ -335,7 +337,7 @@ async function d0SubmitHandle() {
 // 结算信息
 async function merchBaseAccountAjax() {
    try {
-        const res = await merchBaseAccount(route.query.id)
+        const res = await merchBaseAccount(storeUser.userInfo.userId)
        await d1BanknameChange(res.D1.bankCard.bankname, res.D1.bankCard.branchcity)
        await d0BanknameChange(res.D1.bankCard.bankname, res.D1.bankCard.branchcity)

@@ -385,7 +387,7 @@ async function merchBaseAccountAjax() {

 // 结算人与收银台合照 结算人手持身份证照
 const authForm = reactive({
-    merchantCode: route.query.merchantcode,
+    merchantCode: storeUser.userInfo.merchantcode,
    picUrl: ''
 })
 const authFormLoading = ref(false)
@@ -394,7 +396,7 @@ const authFormUpload1 = ref(null)
 // 认证信息
 async function authenticationAjax() {
    try {
-        const res = await authentication(route.query.id)
+        const res = await authentication(storeUser.userInfo.userId)
        authForm.picUrl = res.image
        authFormUpload1.value.pselectFile({ url: res.image })
    } catch (error) {
--- a/src/views/organization/components/shopInfo.vue
+++ b/src/views/organization/components/shopInfo.vue
@@ -33,7 +33,8 @@
            </el-col>
            <el-col :span="span">
                <el-form-item prop="contactmobile" label="联系人电话">
-                    <el-input v-model="form.contactmobile" placeholder="请输入联系人电话" @input="e => form.contactmobile = removeSpaces(e)"/>
+                    <el-input v-model="form.contactmobile" placeholder="请输入联系人电话"
+                        @input="e => form.contactmobile = removeSpaces(e)" />
                </el-form-item>
            </el-col>
        </el-row>
@@ -79,9 +80,9 @@
                </el-form-item>
            </el-col>
        </el-row>
-        <el-form-item>
+        <!-- <el-form-item>
            <el-button type="primary" @click="submitHandel">立即提交</el-button>
-        </el-form-item>
+        </el-form-item> -->
    </el-form>
    <el-dialog title="经营类目" v-model="showDialog" @open="mccOpen">
        <el-space>
@@ -122,6 +123,8 @@ import { useRoute } from 'vue-router'
 import { reactive } from 'vue';
 import { ElDialog } from 'element-plus';
 const route = useRoute()
+import { useUser } from "@/store/user.js";
+const storeUser = useUser();

 const span = ref(8)
 const gutter = ref(50)
@@ -134,10 +137,10 @@ const uploadRef3 = ref(null)

 const form = reactive({
    id: '',
-    userid: route.query.id,
+    userid: storeUser.userInfo.userId,
    merchantname: '',
    merchanttype: '',
-    merchantcode: route.query.merchantcode,
+    merchantcode: storeUser.userInfo.merchantcode,
    alias: '',
    contactname: '',
    email: '',
@@ -237,7 +240,7 @@ function selectMcc(row) {
 // 商户基本信息
 async function merchBaseInfoAjax() {
    try {
-        const res = await merchBaseInfo(route.query.id)
+        const res = await merchBaseInfo(storeUser.userInfo.userId)
        const m = {
            1: '小微',
            2: '个体',
--- a/src/views/organization/shop_detail.vue
+++ b/src/views/organization/shop_detail.vue
@@ -11,7 +11,7 @@
            <div class="compont_wrap">
                <component :is="componentList[type]" />
            </div>
-            <div class="shop_info">
+            <!-- <div class="shop_info">
                <div class="header">
                    <el-text size="large">商户关联信息</el-text>
                </div>
@@ -58,7 +58,7 @@
                            @size-change="paginationChange" @current-change="paginationChange" />
                    </div>
                </div>
-            </div>
+            </div> -->
        </div>
    </div>
 </template>
@@ -75,7 +75,10 @@ import businessLicense from './components/businessLicense.vue'
 import { useRoute } from 'vue-router'
 import { reactive } from 'vue'
 import { dayjs } from 'element-plus'
-const route = useRoute()
+import { useUser } from "@/store/user.js";
+const storeUser = useUser();
+
+// const route = useRoute()

 const authInfo = ref({})

@@ -109,7 +112,7 @@ function paginationChange() {
 // 实名认证信息页面(实名个数)
 async function connectInfoAjax() {
    try {
-        const res = await connectInfo(route.query.id)
+        const res = await connectInfo(storeUser.userInfo.userId)
        authInfo.value = res
    } catch (error) {
        console.log('实名认证信息页面error：', error)
@@ -120,7 +123,7 @@ async function connectInfoAjax() {
 async function userIpPageAjax() {
    try {
        const res = await userIpPage({
-            userId: route.query.id,
+            userId: storeUser.userInfo.userId,
            currPage: tableOptions.pageNum,
            size: tableOptions.pageSzie
        })
@@ -135,7 +138,7 @@ async function userIpPageAjax() {
 // 实名认证信息
 async function merchantInfoDetailAjax() {
    try {
-        const res = await merchantInfoDetail(route.query.id)
+        const res = await merchantInfoDetail(storeUser.userInfo.userId)
        if (res.bankCard.bankname) {
            navs.push(
                {
@@ -152,7 +155,7 @@ async function merchantInfoDetailAjax() {
 // 商户基本信息
 async function merchBaseInfoAjax() {
    try {
-        const res = await merchBaseInfo(route.query.id)
+        const res = await merchBaseInfo(storeUser.userInfo.userId)
        if (res.merchantBaseInfo.mccname) {
            navs.push(
                {
@@ -169,7 +172,7 @@ async function merchBaseInfoAjax() {
 // 营业执照信息
 async function merchLicenseAjax() {
    try {
-        const res = await merchLicense(route.query.id)
+        const res = await merchLicense(storeUser.userInfo.userId)
        if (res.license.principalperson) {
            navs.push(
                {
@@ -186,7 +189,7 @@ async function merchLicenseAjax() {
 // 结算信息
 async function merchBaseAccountAjax() {
    try {
-        const res = await merchBaseAccount(route.query.id)
+        const res = await merchBaseAccount(storeUser.userInfo.userId)
        if (res.D0.bankCard) {
            navs.push(
                {
@@ -203,7 +206,7 @@ async function merchBaseAccountAjax() {
 // 通道进件信息
 async function messageChannelAjax() {
    try {
-        const res = await messageChannel(route.query.id, route.query.merchantcode)
+        const res = await messageChannel(storeUser.userInfo.userId, storeUser.userInfo.merchantcode)
        if (res.merchantChannelMessage.length) {
            navs.push(
                {
@@ -219,17 +222,17 @@ async function messageChannelAjax() {

 onMounted(async () => {
    tableOptions.loading = false
-    connectInfoAjax()
-    userIpPageAjax()
+    // connectInfoAjax()
+    // userIpPageAjax()
    await merchantInfoDetailAjax()
    await merchBaseInfoAjax()
    await merchLicenseAjax()
    await merchBaseAccountAjax()
-    await messageChannelAjax()
+    // await messageChannelAjax()
    type.value = navs[0].type
-    if (route.query.type && route.query.type == 'msg1') {
-        type.value = 5
-    }
+    // if (route.query.type && route.query.type == 'msg1') {
+    //     type.value = 5
+    // }
 })
 </script>
Author	SHA1	Message	Date
gyq	1659362dc5	更改文档为https	2024-02-26 16:16:54 +08:00
gyq	d4f60b66e8	上线	2024-02-23 18:29:14 +08:00
gyq	681d16c0a1	优化订单列表	2024-02-22 14:56:35 +08:00
gyq	7af9be8c53	优化	2024-02-21 18:41:36 +08:00
gyq	ab4e2e9663	优化	2024-02-20 14:56:22 +08:00
gyq	408c611cca	优化	2024-02-20 13:48:14 +08:00
gyq	0f51176cee	订单新增分页	2024-02-20 13:47:46 +08:00
gyq	64c0ec97c9	新增开放平台	2024-02-20 09:56:17 +08:00