feat: 合并冲突

08f6a66f · 盖献康 · 58bf6dfe · 08f6a66f · 08f6a66f · 08f6a66f
Commit 08f6a66f authored Feb 29, 2024 by 盖献康
23 changed files
--- a/.editorconfig
+++ b/.editorconfig
 # 告诉EditorConfig插件，这是根文件，不用继续往上查找
 root = true
 # 匹配全部文件
 [*]
 # 设置字符集
 charset = utf-8
 # 缩进风格，可选space、tab
 indent_style = space
 # 缩进的空格数
 indent_size = 2
 # 结尾换行符，可选lf、cr、crlf
 end_of_line = lf
 # 在文件结尾插入新行
 insert_final_newline = true
 # 删除一行中的前后空格
 trim_trailing_whitespace = true
 # 匹配md结尾的文件
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
--- a/babel.config copy.js
+++ b/babel.config copy.js
 module.exports = {
  presets: [
    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
    '@vue/cli-plugin-babel/preset'
  ],
  'env': {
    'development': {
      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
      'plugins': ['dynamic-import-node']
    }
  }
 }
\ No newline at end of file
--- a/babel.config.js
+++ b/babel.config.js
 module.exports = {
  presets: [
    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
    '@vue/cli-plugin-babel/preset'
  ],
  'env': {
    'development': {
      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
      'plugins': ['dynamic-import-node']
    }
  }
 }
\ No newline at end of file
--- a/bin/package.bat
+++ b/bin/package.bat
 @echo off
 echo.
 echo [信息] 安装Web工程，生成node_modules文件。
 echo.
 %~d0
 cd %~dp0
 cd ..
 npm install --registry=https://registry.npmmirror.com
 pause
\ No newline at end of file
--- a/bin/run-web.bat
+++ b/bin/run-web.bat
 @echo off
 echo.
 echo [信息] 使用 Vue CLI 命令运行 Web 工程。
 echo.
 %~d0
 cd %~dp0
 cd ..
 npm run dev
 pause
\ No newline at end of file
--- a/build/index.js
+++ b/build/index.js
 const { run } = require('runjs')
 const chalk = require('chalk')
 const config = require('../vue.config.js')
 const rawArgv = process.argv.slice(2)
 const args = rawArgv.join(' ')
 if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
  const report = rawArgv.includes('--report')
  run(`vue-cli-service build ${args}`)
  const port = 9526
  const publicPath = config.publicPath
  var connect = require('connect')
  var serveStatic = require('serve-static')
  const app = connect()
  app.use(
    publicPath,
    serveStatic('./dist', {
      index: ['index.html', '/']
    })
  )
  app.listen(port, function () {
    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
    if (report) {
      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
    }
  })
 } else {
  run(`vue-cli-service build ${args}`)
 }
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/html/ie.html
+++ b/public/html/ie.html
--- a/public/robots.txt
+++ b/public/robots.txt
 User-agent: *
 Disallow: /
\ No newline at end of file
--- a/src/assets/401_images/401.gif
+++ b/src/assets/401_images/401.gif
--- a/src/assets/404_images/404.png
+++ b/src/assets/404_images/404.png
--- a/src/assets/404_images/404_cloud.png
+++ b/src/assets/404_images/404_cloud.png
--- a/src/assets/images/light.svg
+++ b/src/assets/images/light.svg
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
    xmlns="http://www.w3.org/2000/svg" 
    xmlns:xlink="http://www.w3.org/1999/xlink">
    <defs>
        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
            <feMerge>
                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
                <feMergeNode in="SourceGraphic"></feMergeNode>
            </feMerge>
        </filter>
        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
        </filter>
    </defs>
    <g id="配置面板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="setting-copy-2" transform="translate(-1254.000000, -136.000000)">
            <g id="Group-8" transform="translate(1167.000000, 0.000000)">
                <g id="Group-5" filter="url(#filter-1)" transform="translate(89.000000, 137.000000)">
                    <mask id="mask-3" fill="white">
                        <use xlink:href="#path-2"></use>
                    </mask>
                    <g id="Rectangle-18">
                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
                    </g>
                    <rect id="Rectangle-18" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
                </g>
            </g>
        </g>
    </g>
 </svg>
\ No newline at end of file
--- a/src/assets/images/login-background.jpg
+++ b/src/assets/images/login-background.jpg
--- a/src/assets/images/pay.png
+++ b/src/assets/images/pay.png
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
--- a/src/assets/images/questionnaire/shencharenshu.png
+++ b/src/assets/images/questionnaire/shencharenshu.png
--- a/src/assets/images/questionnaire/shibailv.png
+++ b/src/assets/images/questionnaire/shibailv.png
--- a/src/assets/images/questionnaire/sign1.png
+++ b/src/assets/images/questionnaire/sign1.png
--- a/src/assets/images/questionnaire/sign2.png
+++ b/src/assets/images/questionnaire/sign2.png
--- a/src/assets/images/questionnaire/tongguolv.png
+++ b/src/assets/images/questionnaire/tongguolv.png
--- a/src/assets/images/questionnaire/xizeshu.png
+++ b/src/assets/images/questionnaire/xizeshu.png
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png