修改bug

.nuxt/dev/index.mjs

@@ -196,21 +196,14 @@ if (!window.__NUXT_DEVTOOLS_TIME_METRIC__) {
 window.__NUXT_DEVTOOLS_TIME_METRIC__.appInit = Date.now()
 `;
 
-<<<<<<< HEAD
 const _o3yZBW1Rnc = (function(nitro) {
-=======
 const _MoCGaRUN7w = (function(nitro) {
->>>>>>> b7384efd13504e61e59724eb6cefc1617c5b0127
   nitro.hooks.hook("render:html", (htmlContext) => {
     htmlContext.head.push(`<script>${script}<\/script>`);
   });
 });
 
-<<<<<<< HEAD
 const rootDir = "D:/dev/nuxt/sannongzixunwang_web";
-=======
-const rootDir = "D:/MyProject/105/sannongzixunwang_web";
->>>>>>> b7384efd13504e61e59724eb6cefc1617c5b0127
 
 const appHead = {"meta":[{"name":"viewport","content":"width=device-width, initial-scale=1"},{"charset":"utf-8"}],"link":[],"style":[],"script":[],"noscript":[]};
 
@@ -229,11 +222,7 @@ const devReducers = {
   URL: (data) => data instanceof URL ? data.toString() : undefined
 };
 const asyncContext = getContext("nuxt-dev", { asyncContext: true, AsyncLocalStorage });
-<<<<<<< HEAD
 const _e2UTql7fjT = (nitroApp) => {
-=======
-const _oeSAu3NnQa = (nitroApp) => {
->>>>>>> b7384efd13504e61e59724eb6cefc1617c5b0127
   const handler = nitroApp.h3App.handler;
   nitroApp.h3App.handler = (event) => {
     return asyncContext.callAsync({ logs: [], event }, () => handler(event));
@@ -303,7 +292,6 @@ function onConsoleLog(callback) {
 }
 
 const plugins = [
-<<<<<<< HEAD
   _o3yZBW1Rnc,
 _e2UTql7fjT
 ];
@@ -318,22 +306,6 @@ const handlers = [
 ];
 
 const serverAssets = [{"baseName":"server","dir":"D:/dev/nuxt/sannongzixunwang_web/server/assets"}];
-=======
-  _MoCGaRUN7w,
-_oeSAu3NnQa
-];
-
-const _lazy_MneAP7 = () => Promise.resolve().then(function () { return index; });
-const _lazy_spp1nD = () => Promise.resolve().then(function () { return renderer$1; });
-
-const handlers = [
-  { route: '/api', handler: _lazy_MneAP7, lazy: true, middleware: false, method: undefined },
-  { route: '/__nuxt_error', handler: _lazy_spp1nD, lazy: true, middleware: false, method: undefined },
-  { route: '/**', handler: _lazy_spp1nD, lazy: true, middleware: false, method: undefined }
-];
-
-const serverAssets = [{"baseName":"server","dir":"D:/MyProject/105/sannongzixunwang_web/server/assets"}];
->>>>>>> b7384efd13504e61e59724eb6cefc1617c5b0127
 
 const assets = createStorage();
 
@@ -345,19 +317,11 @@ const storage = createStorage({});
 
 storage.mount('/assets', assets);
 
-<<<<<<< HEAD
 storage.mount('root', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\dev\\nuxt\\sannongzixunwang_web","ignore":["**/node_modules/**","**/.git/**"]}));
 storage.mount('src', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\dev\\nuxt\\sannongzixunwang_web\\server","ignore":["**/node_modules/**","**/.git/**"]}));
 storage.mount('build', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\dev\\nuxt\\sannongzixunwang_web\\.nuxt","ignore":["**/node_modules/**","**/.git/**"]}));
 storage.mount('cache', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\dev\\nuxt\\sannongzixunwang_web\\.nuxt\\cache","ignore":["**/node_modules/**","**/.git/**"]}));
 storage.mount('data', unstorage_47drivers_47fs({"driver":"fs","base":"D:\\dev\\nuxt\\sannongzixunwang_web\\.data\\kv","ignore":["**/node_modules/**","**/.git/**"]}));
-=======
-storage.mount('root', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\MyProject\\105\\sannongzixunwang_web","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('src', unstorage_47drivers_47fs({"driver":"fs","readOnly":true,"base":"D:\\MyProject\\105\\sannongzixunwang_web\\server","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('build', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\MyProject\\105\\sannongzixunwang_web\\.nuxt","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('cache', unstorage_47drivers_47fs({"driver":"fs","readOnly":false,"base":"D:\\MyProject\\105\\sannongzixunwang_web\\.nuxt\\cache","ignore":["**/node_modules/**","**/.git/**"]}));
-storage.mount('data', unstorage_47drivers_47fs({"driver":"fs","base":"D:\\MyProject\\105\\sannongzixunwang_web\\.data\\kv","ignore":["**/node_modules/**","**/.git/**"]}));
->>>>>>> b7384efd13504e61e59724eb6cefc1617c5b0127
 
 function useStorage(base = "") {
   return base ? prefixStorage(storage, base) : storage;
@@ -1228,13 +1192,8 @@ function publicAssetsURL(...path) {
 
 globalThis.__buildAssetsURL = buildAssetsURL;
 globalThis.__publicAssetsURL = publicAssetsURL;
-<<<<<<< HEAD
 const getClientManifest = () => import('file://D:/dev/nuxt/sannongzixunwang_web/.nuxt/dist/server/client.manifest.mjs').then((r) => r.default || r).then((r) => typeof r === "function" ? r() : r);
 const getServerEntry = () => import('file://D:/dev/nuxt/sannongzixunwang_web/.nuxt/dist/server/server.mjs').then((r) => r.default || r);
-=======
-const getClientManifest = () => import('file://D:/MyProject/105/sannongzixunwang_web/.nuxt/dist/server/client.manifest.mjs').then((r) => r.default || r).then((r) => typeof r === "function" ? r() : r);
-const getServerEntry = () => import('file://D:/MyProject/105/sannongzixunwang_web/.nuxt/dist/server/server.mjs').then((r) => r.default || r);
->>>>>>> b7384efd13504e61e59724eb6cefc1617c5b0127
 const getSSRStyles = lazyCachedFunction(() => Promise.resolve().then(function () { return styles$1; }).then((r) => r.default || r));
 const getSSRRenderer = lazyCachedFunction(async () => {
   const manifest = await getClientManifest();