diff --git a/Add.html b/Add.html new file mode 100644 index 0000000000000000000000000000000000000000..ab19c2368ddafbdb7a29b3f671d579b0d9046abf --- /dev/null +++ b/Add.html @@ -0,0 +1,30 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/yunyou_pavilion/package-lock.json b/yunyou_pavilion/package-lock.json index a12e53b7ac28b84717b7953e048630ce415a432a..2b5bfa0b47f80f5202f3278b1608db7c6bb8645f 100644 --- a/yunyou_pavilion/package-lock.json +++ b/yunyou_pavilion/package-lock.json @@ -8,12 +8,18 @@ "name": "yunyou_pavilion", "version": "0.0.0", "dependencies": { +<<<<<<< HEAD + "axios": "^1.7.2", + "pinia": "^2.1.7", + "vant": "^4.9.1", +======= "@amap/amap-jsapi-loader": "^1.0.1", "animate.css": "^4.1.1", "axios": "^1.7.2", "pinia": "^2.1.7", "vant": "^4.9.1", "vant-green": "^1.0.44", +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "vue": "^3.4.29", "vue-router": "^4.3.3" }, @@ -158,6 +164,8 @@ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true }, +<<<<<<< HEAD +======= "node_modules/@vant/auto-import-resolver": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/@vant/auto-import-resolver/-/auto-import-resolver-1.2.1.tgz", @@ -169,6 +177,7 @@ "resolved": "https://registry.npmmirror.com/@vant/icons/-/icons-1.1.15.tgz", "integrity": "sha512-96tbJotfofrKpOrUGWKkiGLJsCFc0OX5pikWLW5yarD+EMhi0zCrQSDb95xGrp/HETAFm+nSTQu2e1zGsWN/7A==" }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/@vant/popperjs": { "version": "1.3.0", "resolved": "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz", @@ -296,6 +305,8 @@ "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.29.tgz", "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==" }, +<<<<<<< HEAD +======= "node_modules/acorn": { "version": "8.12.0", "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.0.tgz", @@ -326,6 +337,7 @@ "node": ">= 8" } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", @@ -341,6 +353,8 @@ "proxy-from-env": "^1.1.0" } }, +<<<<<<< HEAD +======= "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", @@ -404,6 +418,7 @@ "fsevents": "~2.3.2" } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", @@ -415,17 +430,22 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/confbox": { "version": "0.1.7", "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.1.7.tgz", "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", "dev": true }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, +<<<<<<< HEAD +======= "node_modules/debug": { "version": "4.3.5", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.5.tgz", @@ -443,6 +463,7 @@ } } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -517,6 +538,8 @@ "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz", "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" }, +<<<<<<< HEAD +======= "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.2.tgz", @@ -554,6 +577,7 @@ "node": ">=8" } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/follow-redirects": { "version": "1.15.6", "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz", @@ -684,6 +708,8 @@ "@jridgewell/sourcemap-codec": "^1.4.15" } }, +<<<<<<< HEAD +======= "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", @@ -706,6 +732,7 @@ "node": ">=8.6" } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", @@ -725,6 +752,8 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD +======= "node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz", @@ -758,6 +787,7 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz", @@ -900,6 +930,8 @@ "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, +<<<<<<< HEAD +======= "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -947,6 +979,7 @@ "node": ">=0.10.0" } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/rollup": { "version": "4.18.0", "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.18.0.tgz", @@ -1019,6 +1052,8 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/strip-literal": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-2.1.0.tgz", @@ -1165,6 +1200,7 @@ } } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/vant": { "version": "4.9.1", "resolved": "https://registry.npmmirror.com/vant/-/vant-4.9.1.tgz", @@ -1178,6 +1214,8 @@ "vue": "^3.0.0" } }, +<<<<<<< HEAD +======= "node_modules/vant-green": { "version": "1.0.44", "resolved": "https://registry.npmmirror.com/vant-green/-/vant-green-1.0.44.tgz", @@ -1192,6 +1230,7 @@ "vue": ">= 2.5.0" } }, +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "node_modules/vite": { "version": "5.3.1", "resolved": "https://registry.npmmirror.com/vite/-/vite-5.3.1.tgz", diff --git a/yunyou_pavilion/package.json b/yunyou_pavilion/package.json index b83d222140b4e4dcbef4706b69b9124ba4539072..129f23d666909507c3feec329cfbd9a577d5709b 100644 --- a/yunyou_pavilion/package.json +++ b/yunyou_pavilion/package.json @@ -9,12 +9,18 @@ "preview": "vite preview" }, "dependencies": { +<<<<<<< HEAD + "axios": "^1.7.2", + "pinia": "^2.1.7", + "vant": "^4.9.1", +======= "@amap/amap-jsapi-loader": "^1.0.1", "animate.css": "^4.1.1", "axios": "^1.7.2", "pinia": "^2.1.7", "vant": "^4.9.1", "vant-green": "^1.0.44", +>>>>>>> 7982b37a537c76954bc57cafc07253d54aa4dce7 "vue": "^3.4.29", "vue-router": "^4.3.3" }, diff --git a/yunyou_pavilion/public/1.png b/yunyou_pavilion/public/1.png new file mode 100644 index 0000000000000000000000000000000000000000..be2461a8bff8a75b3f18d690e7cb1fc2de135171 Binary files /dev/null and b/yunyou_pavilion/public/1.png differ diff --git a/yunyou_pavilion/public/2.png b/yunyou_pavilion/public/2.png new file mode 100644 index 0000000000000000000000000000000000000000..a531a74727e353a3fde3d9bc870408ec33854866 Binary files /dev/null and b/yunyou_pavilion/public/2.png differ diff --git a/yunyou_pavilion/public/5.png b/yunyou_pavilion/public/5.png new file mode 100644 index 0000000000000000000000000000000000000000..bd82ffcb169360be43463e2edb907d51bd8c651d Binary files /dev/null and b/yunyou_pavilion/public/5.png differ diff --git a/yunyou_pavilion/public/6.png b/yunyou_pavilion/public/6.png new file mode 100644 index 0000000000000000000000000000000000000000..bae9c04e23b5d1218d872f77698fb419b2e04b8c Binary files /dev/null and b/yunyou_pavilion/public/6.png differ diff --git a/yunyou_pavilion/public/7.png b/yunyou_pavilion/public/7.png new file mode 100644 index 0000000000000000000000000000000000000000..65e43465f789750fe87451fd141b2d4b25856c75 Binary files /dev/null and b/yunyou_pavilion/public/7.png differ diff --git a/yunyou_pavilion/public/fangdajing.png b/yunyou_pavilion/public/fangdajing.png new file mode 100644 index 0000000000000000000000000000000000000000..bb006afc2b3cf7160293054c04c0cd8e931c4f72 Binary files /dev/null and b/yunyou_pavilion/public/fangdajing.png differ diff --git a/yunyou_pavilion/public/fenxiang.png b/yunyou_pavilion/public/fenxiang.png index 2c2ee9cea638e542f667b9901a187397c37dd78a..7b05f7116524d9dcaf6bcfa737d529876cbe9639 100644 Binary files a/yunyou_pavilion/public/fenxiang.png and b/yunyou_pavilion/public/fenxiang.png differ diff --git a/yunyou_pavilion/public/jiantou2.png b/yunyou_pavilion/public/jiantou2.png new file mode 100644 index 0000000000000000000000000000000000000000..be2461a8bff8a75b3f18d690e7cb1fc2de135171 Binary files /dev/null and b/yunyou_pavilion/public/jiantou2.png differ diff --git a/yunyou_pavilion/public/tupian_huaban.png b/yunyou_pavilion/public/tupian_huaban.png new file mode 100644 index 0000000000000000000000000000000000000000..f260295e3847e12212bb8e4f21893fd2066720c8 Binary files /dev/null and b/yunyou_pavilion/public/tupian_huaban.png differ diff --git a/yunyou_pavilion/src/App.vue b/yunyou_pavilion/src/App.vue index 66c900ee4073a8208b458e7e7118c6599a39d66e..891bb1b6e1af525bde0879eb44ebe98cfebb20f6 100644 --- a/yunyou_pavilion/src/App.vue +++ b/yunyou_pavilion/src/App.vue @@ -1,7 +1,16 @@ + + diff --git a/yunyou_pavilion/src/views/Mylist/List.vue b/yunyou_pavilion/src/views/Mylist/List.vue new file mode 100644 index 0000000000000000000000000000000000000000..3b67a879dea3852b33ee7b4de88a776bd4234f25 --- /dev/null +++ b/yunyou_pavilion/src/views/Mylist/List.vue @@ -0,0 +1,284 @@ + + + \ No newline at end of file diff --git a/yunyou_pavilion/src/views/Mylist/Mysou.vue b/yunyou_pavilion/src/views/Mylist/Mysou.vue new file mode 100644 index 0000000000000000000000000000000000000000..330bfe42b62bc6c9db78c1a6843ab355d47a255d --- /dev/null +++ b/yunyou_pavilion/src/views/Mylist/Mysou.vue @@ -0,0 +1,73 @@ + + + \ No newline at end of file diff --git a/yunyou_pavilion/src/views/Mylist/Xiang.vue b/yunyou_pavilion/src/views/Mylist/Xiang.vue new file mode 100644 index 0000000000000000000000000000000000000000..bdc9a5d4eeb742d3d2492bf8d3a61d52c49bffb3 --- /dev/null +++ b/yunyou_pavilion/src/views/Mylist/Xiang.vue @@ -0,0 +1,21 @@ + + + \ No newline at end of file diff --git a/yunyou_pavilion/src/views/Mylist/shi.vue b/yunyou_pavilion/src/views/Mylist/shi.vue new file mode 100644 index 0000000000000000000000000000000000000000..64e5e8a52620c9f2f9f807e06ed1e42640cdec45 --- /dev/null +++ b/yunyou_pavilion/src/views/Mylist/shi.vue @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/yunyou_pavilion/src/views/Mylist/wenzhang.vue b/yunyou_pavilion/src/views/Mylist/wenzhang.vue new file mode 100644 index 0000000000000000000000000000000000000000..1c39ebb61c6b77007e003f28759a3e7de9567608 --- /dev/null +++ b/yunyou_pavilion/src/views/Mylist/wenzhang.vue @@ -0,0 +1,61 @@ + + + \ No newline at end of file