合并冲突修改

src/api/allApi.js

@@ -24,6 +24,14 @@ export function indexList() {
 }
 
 
+//2024中秋签到
+export function MidAutumnSignIn(query) {
+  return request({
+    url: '/MidAutumn/Activity/signIn',
+    method: 'get',
+    params:query
+  })
+}
 //获取培训上传备注
 export function remarkHtml(query) {
   return request({

src/router/index.js

@@ -116,10 +116,6 @@ const routes = [
       },
     ]
   },
-  {
-    path: '/rechargeAgreement',
-    component: () => import('../views/RechargeAgreement.vue'),
-  },
   {
     path: '/noticeCenter',
     component: () => import('../views/NoticeCenter.vue'),