Merge remote-tracking branch 'origin/dev' into dev

main/src/micro/app.js

@@ -18,10 +18,10 @@ export const leftApps = [
     icon: 'images/platform/icon-admin.png',
   },
   {
-    name: 'sub-app',
+    name: 'sub-app2',
     entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
-    title: 'APP2',
+    title: 'APP',
     icon: 'images/platform/icon-app.png',
   },
   {
@@ -49,10 +49,10 @@ export const rightApps = [
     icon: 'images/platform/icon-admin.png',
   },
   {
-    name: 'sub-app',
+    name: 'sub-app1',
     entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
-    title: 'APP1',
+    title: 'APP',
     icon: 'images/platform/icon-app.png',
   },
   {

main/src/views/index.vue

@@ -36,9 +36,9 @@ import { getAssetsFile } from '@/utils';
 
 const gotoPage = (row) => {
   // window.history.pushState({}, row.name, row.activeRule);
-  if (row.title == 'APP1') {
+  if (row.name == 'sub-app1') {
     window.location.href = 'https://www.pgyer.com/MXd3uUrO';
-  } else if (row.title == 'APP2') {
+  } else if (row.name == 'sub-app2') {
     window.location.href = 'https://www.pgyer.com/4SVVtpob';
   } else {
     window.location.href = row.activeRule;

sub-government-affairs-service/src/apis/businessEntity/index.js

@@ -29,13 +29,11 @@ export function editBusinessSubject(data) {
  * 生产经营主体 - 分页查询
  * @param {Object} params 查询参数
  */
-export function fetchBusinessSubjectList(query) {
+export function fetchBusinessSubjectList(params) {
   return request({
     url: '/product-business/business/businessPage',
     method: 'get',
-    params: {
-      businessSubjectQuery: JSON.stringify(query),
-    },
+    params,
   });
 }
 

sub-government-affairs-service/src/views/productOperateMain/individual/index.vue

@@ -245,32 +245,6 @@ const rowUpdate = (row, index, done, loading) => {
     });
 };
 
-// 删除
-// const rowDel = (row, index, done) => {
-//   if (isEmpty(row)) return;
-//   app
-//     .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
-//       confirmButtonText: '确定',
-//       cancelButtonText: '取消',
-//       type: 'warning',
-//     })
-//     .then(() => {
-//       console.info('删除', row.recordId);
-//       delOperationRecord(row.recordId || '')
-//         .then((res) => {
-//           if (res.code === 200) {
-//             app.$message.success('删除成功！');
-//             loadData();
-//             done();
-//           }
-//         })
-//         .catch((err) => {
-//           app.$message.error(err.msg);
-//         });
-//     })
-//     .catch(() => {});
-// };
-
 const onBatchDel = () => {
   let ids = handleIds();
   if (!ids.length || ids.length <= 0) {