merge

index.html

@@ -9,7 +9,7 @@
   <meta content="telephone=no,email=no" name=format-detection>
   <meta name="viewport"
     content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui" />
-  <title>basecode</title>
+  <title>AI合成全家福，迎中秋金饼</title>
   <script>
     const isWeixinPlatform = /MicroMessenger/i.test(window.navigator.userAgent) || window.__wxjs_environment === 'miniprogram'
     if (isWeixinPlatform) {
@@ -34,7 +34,7 @@
     const org_id = getParam("org_id")
     const code = getParam("code")
     const appid = "wx718c4a40911b7837"
-    const host = "https://huodong2.lzlj.com/iceSip/"
+    const host = "https://huodong2.lzlj.com/faceFamily/"
 
     if (isWeixinPlatform && !isLogin && !code) {
       let url = encodeURIComponent(host)
@@ -109,8 +109,8 @@
               const shareData = {
                 title: document.title,
                 desc: document.title,
-                link: "https://huodong2.lzlj.com/iceSip/",
+                link: "https://huodong2.lzlj.com/faceFamily/",
-                imgUrl: "https://huodong2.lzlj.com/iceSip/share.webp"
+                imgUrl: "https://huodong2.lzlj.com/faceFamily/share.webp"
               }
               wx.updateAppMessageShareData({
                 title: shareData.title, // 分享标题

src/router/index.js

@@ -2,7 +2,7 @@ import { createRouter, createWebHistory } from 'vue-router'
 import routes from './routes' // 导入路由定义
 
 const router = createRouter({
-  history: createWebHistory('faceFamily'),
+  history: createWebHistory('/faceFamily/'),
   routes
 })
 

src/static/imageBackground.js

@@ -50,6 +50,7 @@ import paidui_6 from '../assets/images/generate/template/paidui/paidui_6.webp'
 const imageBackground = [
     {
         id: 1,
+<<<<<<< HEAD
         titleImgUrl: shenxian_bg,
         children: [
             {
@@ -59,26 +60,31 @@ const imageBackground = [
             },
             {
                 id: 2,
+<<<<<<< HEAD
                 imgUrl: shenxian_2,
                 peopleCount: 2
             },
             {
                 id: 3,
+<<<<<<< HEAD
                 imgUrl: shenxian_3,
                 peopleCount: 2
             },
             {
                 id: 4,
+<<<<<<< HEAD
                 imgUrl: shenxian_4,
                 peopleCount: 3
             },
             {
                 id: 5,
+<<<<<<< HEAD
                 imgUrl: shenxian_5,
                 peopleCount: 4
             },
             {
                 id: 6,
+<<<<<<< HEAD
                 imgUrl: shenxian_6,
                 peopleCount: 5
             }
@@ -86,6 +92,7 @@ const imageBackground = [
     },
     {
         id: 2,
+<<<<<<< HEAD
         titleImgUrl: xianxia_bg,
         children: [
             {
@@ -95,26 +102,31 @@ const imageBackground = [
             },
             {
                 id: 2,
+<<<<<<< HEAD
                 imgUrl: xianxia_2,
                 peopleCount: 2
             },
             {
                 id: 3,
+<<<<<<< HEAD
                 imgUrl: xianxia_3,
                 peopleCount: 3
             },
             {
                 id: 4,
+<<<<<<< HEAD
                 imgUrl: xianxia_4,
                 peopleCount: 3
             },
             {
                 id: 5,
+<<<<<<< HEAD
                 imgUrl: xianxia_5,
                 peopleCount: 4
             },
             {
                 id: 6,
+<<<<<<< HEAD
                 imgUrl: xianxia_6,
                 peopleCount: 5
             }
@@ -122,6 +134,7 @@ const imageBackground = [
     },
     {
         id: 3,
+<<<<<<< HEAD
         titleImgUrl: fugu_bg,
         children: [
             {
@@ -131,26 +144,31 @@ const imageBackground = [
             },
             {
                 id: 2,
+<<<<<<< HEAD
                 imgUrl: fugu_2,
                 peopleCount: 2
             },
             {
                 id: 3,
+<<<<<<< HEAD
                 imgUrl: fugu_3,
                 peopleCount: 2
             },
             {
                 id: 4,
+<<<<<<< HEAD
                 imgUrl: fugu_4,
                 peopleCount: 3
             },
             {
                 id: 5,
+<<<<<<< HEAD
                 imgUrl: fugu_5,
                 peopleCount: 4
             },
             {
                 id: 6,
+<<<<<<< HEAD
                 imgUrl: fugu_6,
                 peopleCount: 5
             }
@@ -158,6 +176,7 @@ const imageBackground = [
     },
     {
         id: 4,
+<<<<<<< HEAD
         titleImgUrl: xinzhongshi_bg,
         children: [
             {
@@ -167,26 +186,31 @@ const imageBackground = [
             },
             {
                 id: 2,
+<<<<<<< HEAD
                 imgUrl: xinzhongshi_2,
                 peopleCount: 2
             },
             {
                 id: 3,
+<<<<<<< HEAD
                 imgUrl: xinzhongshi_3,
                 peopleCount: 2
             },
             {
                 id: 4,
+<<<<<<< HEAD
                 imgUrl: xinzhongshi_4,
                 peopleCount: 3
             },
             {
                 id: 5,
+<<<<<<< HEAD
                 imgUrl: xinzhongshi_5,
                 peopleCount: 4
             },
             {
                 id: 6,
+<<<<<<< HEAD
                 imgUrl: xinzhongshi_6,
                 peopleCount: 5
             }
@@ -194,6 +218,7 @@ const imageBackground = [
     },
     {
         id: 5,
+<<<<<<< HEAD
         titleImgUrl: luying_bg,
         children: [
             {
@@ -203,26 +228,31 @@ const imageBackground = [
             },
             {
                 id: 2,
+<<<<<<< HEAD
                 imgUrl: luying_2,
                 peopleCount: 2
             },
             {
                 id: 3,
+<<<<<<< HEAD
                 imgUrl: luying_3,
                 peopleCount: 2
             },
             {
                 id: 4,
+<<<<<<< HEAD
                 imgUrl: luying_4,
                 peopleCount: 3
             },
             {
                 id: 5,
+<<<<<<< HEAD
                 imgUrl: luying_5,
                 peopleCount: 4
             },
             {
                 id: 6,
+<<<<<<< HEAD
                 imgUrl: luying_6,
                 peopleCount: 5
             }
@@ -230,6 +260,7 @@ const imageBackground = [
     },
     {
         id: 6,
+<<<<<<< HEAD
         titleImgUrl: paidui_bg,
         children: [
             {
@@ -239,26 +270,31 @@ const imageBackground = [
             },
             {
                 id: 2,
+<<<<<<< HEAD
                 imgUrl: paidui_2,
                 peopleCount: 2
             },
             {
                 id: 3,
+<<<<<<< HEAD
                 imgUrl: paidui_3,
                 peopleCount: 2
             },
             {
                 id: 4,
+<<<<<<< HEAD
                 imgUrl: paidui_4,
                 peopleCount: 3
             },
             {
                 id: 5,
+<<<<<<< HEAD
                 imgUrl: paidui_5,
                 peopleCount: 3
             },
             {
                 id: 6,
+<<<<<<< HEAD
                 imgUrl: paidui_6,
                 peopleCount: 5
             }

vite.config.js

@@ -6,7 +6,7 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 
 // https://vite.dev/config/
 export default defineConfig({
-  // base: 'https://huodong2.lzlj.com/faceFamily/',
+  base: process.env.NODE_ENV === 'production' ? 'https://huodong2.lzlj.com/faceFamily/' : '/faceFamily/',
   plugins: [
     vue({
       template: {