init

2024-08-16 18:26:19 +08:00 · 2024-08-16 18:26:19 +08:00 · b6d3e2cbfc
commit b6d3e2cbfc
parent 01ae0a0b47
8622 changed files with 1222944 additions and 0 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/oil-station.iml" filepath="$PROJECT_DIR$/.idea/oil-station.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/oil-station.iml
+++ b/.idea/oil-station.iml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/CLodop_Setup_for_Win32NT.exe
+++ b/CLodop_Setup_for_Win32NT.exe
--- a/fuintAdmin/.editorconfig
+++ b/fuintAdmin/.editorconfig
@ -0,0 +1,22 @@
+# 告诉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/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@ -0,0 +1,17 @@
+# 页面标题
+VUE_APP_TITLE = 百业兴智慧油站系统
+
+# 开发环境配置
+ENV = 'development'
+
+# fuint会员营销系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 发布目录
+VUE_APP_PUBLIC_PATH = '/'
+
+# 后端接口地址
+VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
+
+
+# http://192.168.0.121:8080/
--- a/fuintAdmin/.env.production
+++ b/fuintAdmin/.env.production
@ -0,0 +1,14 @@
+# 页面标题
+VUE_APP_TITLE = 百业兴智慧油站系统
+
+# 生产环境配置
+ENV = 'production'
+
+# fuint会员营销系统/生产环境
+VUE_APP_BASE_API = '/fuint-application/'
+
+# 发布目录
+VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
+
+# 后端接口地址
+VUE_APP_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'
--- a/fuintAdmin/.env.staging
+++ b/fuintAdmin/.env.staging
@ -0,0 +1,14 @@
+# 页面标题
+VUE_APP_TITLE = 百业兴智慧油站系统
+
+# 测试环境配置
+ENV = 'staging'
+
+# fuint会员营销系统/测试环境
+VUE_APP_BASE_API = '/stage-api'
+
+# 发布目录
+VUE_APP_PUBLIC_PATH = '/'
+
+# 后端接口地址
+VUE_APP_SERVER_URL = 'http://192.168.0.121:8080/'
--- a/fuintAdmin/.eslintignore
+++ b/fuintAdmin/.eslintignore
@ -0,0 +1,10 @@
+# 忽略build目录下类型为js的文件的语法检查
+build/*.js
+# 忽略src/assets目录下文件的语法检查
+src/assets
+# 忽略public目录下文件的语法检查
+public
+# 忽略当前目录下为js的文件的语法检查
+*.js
+# 忽略当前目录下为vue的文件的语法检查
+*.vue
--- a/fuintAdmin/.eslintrc.js
+++ b/fuintAdmin/.eslintrc.js
@ -0,0 +1,199 @@
+// ESlint 检查配置
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}
--- a/fuintAdmin/.gitignore
+++ b/fuintAdmin/.gitignore
@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
+
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock
--- a/fuintAdmin/README.md
+++ b/fuintAdmin/README.md
@ -0,0 +1,28 @@
+## 开发
+
+```bash
+
+# 进入项目目录
+cd fuintAdmin
+
+# 安装依赖
+npm install
+
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npmmirror.com
+
+# 启动服务
+npm run dev
+```
+
+浏览器访问 http://localhost:8081
+
+## 发布
+
+```bash
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```
--- a/fuintAdmin/babel.config.js
+++ b/fuintAdmin/babel.config.js
@ -0,0 +1,13 @@
+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']
+    }
+  }
+}
--- a/fuintAdmin/bin/build.bat
+++ b/fuintAdmin/bin/build.bat
@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 打包Web工程，生成dist文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:prod
+
+pause
--- a/fuintAdmin/bin/package.bat
+++ b/fuintAdmin/bin/package.bat
@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 安装Web工程，生成node_modules文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm install --registry=https://registry.npmmirror.com
+
+pause
--- a/fuintAdmin/bin/run-web.bat
+++ b/fuintAdmin/bin/run-web.bat
@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 使用 Vue CLI 命令运行 Web 工程。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run dev
+
+pause
--- a/fuintAdmin/build/index.js
+++ b/fuintAdmin/build/index.js
@ -0,0 +1,35 @@
+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/fuintAdmin/package.json
+++ b/fuintAdmin/package.json
@ -0,0 +1,101 @@
+{
+  "name": "fuintAdmin",
+  "version": "3.0.3",
+  "description": "fuint会员营销系统后台管理端",
+  "author": "FSQ",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "后台": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/fuint/fuint-uniapp.git"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@riophae/vue-treeselect": "0.4.0",
+    "axios": "0.24.0",
+    "bignumber.js": "^9.1.2",
+    "clipboard": "2.0.8",
+    "core-js": "3.25.3",
+    "crypto-js": "^4.2.0",
+    "echarts": "4.9.0",
+    "element-tiptap": "^1.27.1",
+    "element-ui": "2.15.12",
+    "file-saver": "2.0.5",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "html2canvas": "^1.4.1",
+    "js-beautify": "1.13.0",
+    "js-cookie": "3.0.1",
+    "js-pinyin": "^0.2.5",
+    "jsencrypt": "3.0.0-rc.1",
+    "nprogress": "0.2.0",
+    "qrcode": "^1.5.3",
+    "qrcodejs2": "0.0.2",
+    "quill": "1.3.7",
+    "save": "^2.9.0",
+    "screenfull": "5.0.2",
+    "sortablejs": "1.10.2",
+    "vue": "2.6.12",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-meta": "2.4.0",
+    "vue-print-nb": "^1.7.5",
+    "vue-router": "3.4.9",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
+    "babel-plugin-dynamic-import-node": "2.3.3",
+    "chalk": "4.1.0",
+    "compression-webpack-plugin": "5.0.2",
+    "connect": "3.6.6",
+    "eslint": "^6.0.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "1.32.13",
+    "sass-loader": "10.1.1",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "vue-template-compiler": "2.6.12"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}
--- a/fuintAdmin/public/favicon.ico
+++ b/fuintAdmin/public/favicon.ico
--- a/fuintAdmin/public/html/ie.html
+++ b/fuintAdmin/public/html/ie.html
--- a/fuintAdmin/public/index.html
+++ b/fuintAdmin/public/index.html
@ -0,0 +1,208 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="robots" content="nofollow"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title><%= webpackConfig.name %></title>
+    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
+      <style>
+    html,
+    body,
+    #app {
+      height: 100%;
+      margin: 0px;
+      padding: 0px;
+    }
+
+    #loader-wrapper {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      z-index: 999999;
+    }
+
+    #loader {
+      display: block;
+      position: relative;
+      left: 50%;
+      top: 50%;
+      width: 150px;
+      height: 150px;
+      margin: -75px 0 0 -75px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      -webkit-animation: spin 2s linear infinite;
+      -ms-animation: spin 2s linear infinite;
+      -moz-animation: spin 2s linear infinite;
+      -o-animation: spin 2s linear infinite;
+      animation: spin 2s linear infinite;
+      z-index: 1001;
+    }
+
+    #loader:before {
+      content: "";
+      position: absolute;
+      top: 5px;
+      left: 5px;
+      right: 5px;
+      bottom: 5px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      -webkit-animation: spin 3s linear infinite;
+      -moz-animation: spin 3s linear infinite;
+      -o-animation: spin 3s linear infinite;
+      -ms-animation: spin 3s linear infinite;
+      animation: spin 3s linear infinite;
+    }
+
+    #loader:after {
+      content: "";
+      position: absolute;
+      top: 15px;
+      left: 15px;
+      right: 15px;
+      bottom: 15px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      -moz-animation: spin 1.5s linear infinite;
+      -o-animation: spin 1.5s linear infinite;
+      -ms-animation: spin 1.5s linear infinite;
+      -webkit-animation: spin 1.5s linear infinite;
+      animation: spin 1.5s linear infinite;
+    }
+
+
+    @-webkit-keyframes spin {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+
+    @keyframes spin {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+
+
+    #loader-wrapper .loader-section {
+      position: fixed;
+      top: 0;
+      width: 51%;
+      height: 100%;
+      background: #409EFF;
+      z-index: 1000;
+      -webkit-transform: translateX(0);
+      -ms-transform: translateX(0);
+      transform: translateX(0);
+    }
+
+    #loader-wrapper .loader-section.section-left {
+      left: 0;
+    }
+
+    #loader-wrapper .loader-section.section-right {
+      right: 0;
+    }
+
+    .loaded #loader-wrapper .loader-section.section-left {
+      -webkit-transform: translateX(-100%);
+      -ms-transform: translateX(-100%);
+      transform: translateX(-100%);
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+    }
+
+    .loaded #loader-wrapper .loader-section.section-right {
+      -webkit-transform: translateX(100%);
+      -ms-transform: translateX(100%);
+      transform: translateX(100%);
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+    }
+
+    .loaded #loader {
+      opacity: 0;
+      -webkit-transition: all 0.3s ease-out;
+      transition: all 0.3s ease-out;
+    }
+
+    .loaded #loader-wrapper {
+      visibility: hidden;
+      -webkit-transform: translateY(-100%);
+      -ms-transform: translateY(-100%);
+      transform: translateY(-100%);
+      -webkit-transition: all 0.3s 1s ease-out;
+      transition: all 0.3s 1s ease-out;
+    }
+
+    .no-js #loader-wrapper {
+      display: none;
+    }
+
+    .no-js h1 {
+      color: #222222;
+    }
+
+    #loader-wrapper .load_title {
+      font-family: 'Open Sans';
+      color: #FFF;
+      font-size: 19px;
+      width: 100%;
+      text-align: center;
+      z-index: 9999999999999;
+      position: absolute;
+      top: 60%;
+      opacity: 1;
+      line-height: 30px;
+    }
+
+    #loader-wrapper .load_title span {
+      font-weight: normal;
+      font-style: italic;
+      font-size: 13px;
+      color: #FFF;
+      opacity: 0.5;
+    }
+  </style>
+  </head>
+  <body>
+    <div id="app">
+       <div id="loader-wrapper">
+          <div id="loader"></div>
+          <div class="loader-section section-left"></div>
+          <div class="loader-section section-right"></div>
+          <div class="load_title">正在加载系统资源，请耐心等待...</div>
+       </div>
+  </div>
+  </body>
+  <script>
+    window._AMapSecurityConfig = {
+      // 例如 ：serviceHost:'http://1.1.1.1:80/_AMapService',  //安全写法，前面是服务器地址
+      securityJsCode: "6e7d904a9f6e98a02fe4f0bb8f276f98"  //测试时候的写法
+    };
+  </script>
+</html>
--- a/fuintAdmin/public/robots.txt
+++ b/fuintAdmin/public/robots.txt
@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--- a/fuintAdmin/src/App.vue
+++ b/fuintAdmin/src/App.vue
@ -0,0 +1,26 @@
+<template>
+  <div id="app">
+    <router-view />
+  </div>
+</template>
+
+<script>
+  export default  {
+    name:  'App',
+    metaInfo() {
+      return {
+        title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+        titleTemplate: title => {
+          return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+        }
+      }
+    }
+  }
+</script>
+<style >
+  .app-container{
+    width: 100%;
+    //height: 100vh;
+    background: #f6f8f9;
+  }
+</style>
--- a/fuintAdmin/src/api/EventMarketing/SaveBlock.js
+++ b/fuintAdmin/src/api/EventMarketing/SaveBlock.js
@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 分页查询列表
+export function getList(query) {
+  return request({
+    url: 'business/marketingActivity/cardValue',
+    method: 'get',
+    params: query
+  })
+}
+// 新增列表
+export function addList(data) {
+  return request({
+    url: 'business/marketingActivity/cardValue',
+    method: 'post',
+    data: data
+  })
+}
+
+export function mmc(id) {
+  return request({
+    url: 'business/marketingActivity/cardValue/selectById/'+id,
+    method: 'get',
+
+  })
+}
+
+
+export function listUserGrade(data) {
+  return request({
+    url: '/business/userManager/userGrade/list',
+    method: 'get',
+    params: data
+  })
+}
+// 修改列表
+export function eitList(data) {
+  return request({
+    url: 'business/marketingActivity/cardValue',
+    method: 'put',
+    data: data
+  })
+}
+//删除列表
+export function deletedelById(id) {
+  return request({
+    url: 'business/marketingActivity/cardValue/delById?id='+id,
+    method: 'delete',
+
+  })
+}
+
--- a/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
+++ b/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 核销记录列表
+export function listRecord(query) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询兑换券领取记录详细
+export function getRecord(id) {
+  return request({
+    url: '/system/record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增兑换券领取记录
+export function addRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改兑换券领取记录
+export function updateRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除兑换券领取记录
+export function delRecord(id) {
+  return request({
+    url: '/system/record/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@ -0,0 +1,108 @@
+import request from '@/utils/request'
+
+// 油品大类
+export function getoiltype() {
+  return request({
+    url: 'system/dict/data/type/oil_type',
+    method: 'get',
+
+  })
+}
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询消费有礼活动列表
+export function listActiveConsumption(query) {
+  return request({
+    url: '/business/marketingActivity/activeConsumption',
+    method: 'get',
+    params: query
+  })
+}
+//优惠券
+export function listFavorable(query) {
+  return request({
+    url: 'business/marketingActivity/cardFavorable',
+    method: 'get',
+    params: query
+  })
+}
+// 兑换券
+export function listExchange(query) {
+  return request({
+    url: 'business/marketingActivity/cardExchange',
+    method: 'get',
+    params: query
+  })
+}
+// 实物
+export function listLJGoods(query) {
+  return request({
+    url: 'business/convenience/goods/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询消费有礼活动详细
+export function getActiveConsumption(id) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/' + id,
+    method: 'get'
+  })
+}
+
+// 新增消费有礼活动
+export function addActiveConsumption(data) {
+  return request({
+    url: '/business/marketingActivity/activeConsumption',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改消费有礼活动
+export function updateActiveConsumption(data) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改消费有礼活动
+export function editActiveConsumption(data) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/edit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除消费有礼活动
+export function delActiveConsumption(id) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/delById/' + id,
+    method: 'delete'
+  })
+}
+//查看详情
+export function looklook(data) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/detailRecord',
+    method: 'get',
+    params:data
+  })
+}
+export function looklooklook(id) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/detailCount/'+id,
+    method: 'get',
+
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/activeDiscount.js
+++ b/fuintAdmin/src/api/EventMarketing/activeDiscount.js
@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+
+// 查询折扣营销列表
+export function listActiveDiscount(query) {
+  return request({
+    url: 'business/marketingActivity/activeDiscount',
+    method: 'get',
+    params: query
+  })
+}
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询折扣营销详细
+export function getActiveDiscount(id) {
+  return request({
+    url: '/business/marketingActivity/activeDiscount/' + id,
+    method: 'get'
+  })
+}
+
+// 新增折扣营销
+export function addActiveDiscount(data) {
+  return request({
+    url: '/business/marketingActivity/activeDiscount',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改折扣营销
+export function updateActiveDiscount(data) {
+  return request({
+    url: '/business/marketingActivity/activeDiscount',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改折扣营销
+export function editActiveDiscount(data) {
+  return request({
+    url: '/business/marketingActivity/activeDiscount/updateIsOnline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除折扣营销
+export function delActiveDiscount(id) {
+  return request({
+    url: '/business/marketingActivity/activeDiscount/delById/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/activeFullminus.js
+++ b/fuintAdmin/src/api/EventMarketing/activeFullminus.js
@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询满减营销列表
+export function listActiveFullminus(query) {
+  return request({
+    url: '/business/marketingActivity/activeFullminus',
+    method: 'get',
+    params: query
+  })
+}
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询满减营销详细
+export function getActiveFullminus(id) {
+  return request({
+    url: '/business/marketingActivity/activeFullminus/' + id,
+    method: 'get'
+  })
+}
+
+// 新增满减营销
+export function addActiveFullminus(data) {
+  return request({
+    url: '/business/marketingActivity/activeFullminus',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改满减营销
+export function updateActiveFullminus(data) {
+  return request({
+    url: '/business/marketingActivity/activeFullminus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改满减营销
+export function editActiveFullminus(data) {
+  return request({
+    url: '/business/marketingActivity/activeFullminus/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除满减营销
+export function delActiveFullminus(id) {
+  return request({
+    url: '/business/marketingActivity/activeFullminus/delById/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
+++ b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询新人有礼活动列表
+export function listActiveNewlyweds(query) {
+  return request({
+    url: 'business/marketingActivity/activeNewlyweds',
+    method: 'get',
+    params: query
+  })
+}
+// 回显
+export function huiActiveNewlyweds(id) {
+  return request({
+    url: 'business/marketingActivity/activeNewlyweds/'+id,
+    method: 'get',
+
+  })
+}
+
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询新人有礼活动详细
+export function getActiveNewlyweds(id) {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds/' + id,
+    method: 'get'
+  })
+}
+
+// 新增新人有礼活动
+export function addActiveNewlyweds(data) {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改新人有礼活动
+export function updateActiveNewlyweds(data) {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 修改新人有礼活动
+export function editActiveNewlyweds(data) {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除新人有礼活动
+export function delActiveNewlyweds(id) {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds/delById/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/activeRecommend.js
+++ b/fuintAdmin/src/api/EventMarketing/activeRecommend.js
@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 查询推荐有礼列表
+export function listActiveRecommend(query) {
+  return request({
+    url: 'business/marketingActivity/activeRecommend',
+    method: 'get',
+    params: query
+  })
+}
+
+//优惠券
+export function listFavorable(query) {
+  return request({
+    url: 'business/marketingActivity/cardFavorable',
+    method: 'get',
+    params: query
+  })
+}
+// 兑换券
+export function listExchange(query) {
+  return request({
+    url: 'business/marketingActivity/cardExchange',
+    method: 'get',
+    params: query
+  })
+}
+// 查询推荐有礼详细
+export function getActiveRecommend(id) {
+  return request({
+    url: '/business/marketingActivity/activeRecommend/' + id,
+    method: 'get'
+  })
+}
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增推荐有礼
+export function addActiveRecommend(data) {
+  return request({
+    url: 'business/marketingActivity/activeRecommend',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改推荐有礼
+export function updateActiveRecommend(data) {
+  return request({
+    url: 'business/marketingActivity/activeRecommend',
+    method: 'put',
+    data: data
+  })
+}
+// 修改推荐有礼
+export function editActiveRecommend(data) {
+  return request({
+    url: 'business/marketingActivity/activeRecommend/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除推荐有礼
+export function delActiveRecommend(id) {
+  return request({
+    url: '/business/marketingActivity/activeRecommend/delById/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+// 查询兑换券列表
+export function listExchange(query) {
+  return request({
+    url: 'business/marketingActivity/cardExchange',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询兑换券列表
+export function exchangeInfo(id) {
+  return request({
+    url: 'business/marketingActivity/cardExchange/'+id,
+    method: 'get',
+  })
+}
+
+// 查询兑换券详细
+export function getExchange(id) {
+  return request({
+    url: '/system/exchange/' + id,
+    method: 'get'
+  })
+}
+
+// 新增兑换券
+export function addExchange(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改兑换券
+export function updateExchange(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除兑换券
+export function delExchange(id) {
+  return request({
+    url: '/business/marketingActivity/cardExchange/' + id,
+    method: 'delete'
+  })
+}
+export function getqueryGoods() {
+  return request({
+    url: 'business/convenience/goods/queryGoods',
+    method: 'get'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 领取记录列表
+export function listRecord(query) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询兑换券领取记录详细
+export function getRecord(id) {
+  return request({
+    url: '/system/record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增兑换券领取记录
+export function addRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改兑换券领取记录
+export function updateRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'put',
+    data: data
+  })
+}
+// 核销
+export function cardExchangeRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除兑换券领取记录
+export function delRecord(id) {
+  return request({
+    url: '/system/record/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/cardFavorable.js
+++ b/fuintAdmin/src/api/EventMarketing/cardFavorable.js
@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+// 查询优惠券列表
+export function listFavorable(query) {
+  return request({
+    url: 'business/marketingActivity/cardFavorable',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券详细
+export function getFavorable(id) {
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord/count' + id,
+    method: 'get'
+  })
+}
+// 新建查询
+export function getcardFavorable(id) {
+  return request({
+    url: '/business/marketingActivity/cardFavorable/' + id,
+    method: 'get'
+  })
+}
+// 查询优惠券统计
+export function getcount(id) {
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord/count?id=' + id,
+    method: 'get'
+  })
+}
+// 查询优惠券统计列表
+export function getcountList(query) {
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增优惠券
+export function addFavorable(data) {
+  return request({
+    url: '/business/marketingActivity/cardFavorable',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券
+export function updateFavorable(data) {
+  return request({
+    url: '/business/marketingActivity/cardFavorable',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券
+export function delFavorable(id) {
+  return request({
+    url: '/business/marketingActivity/cardFavorable/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/cardFavorableRecord.js
+++ b/fuintAdmin/src/api/EventMarketing/cardFavorableRecord.js
@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询优惠券记录列表
+export function listRecord(query) {
+  return request({
+    url: '/business/marketingActivity/record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券记录详细
+export function getRecord(id) {
+  return request({
+    url: '/business/marketingActivity/record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增优惠券记录
+export function addRecord(data) {
+  return request({
+    url: '/business/marketingActivity/record',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券记录
+export function updateRecord(data) {
+  return request({
+    url: '/business/marketingActivity/record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券记录
+export function delRecord(id) {
+  return request({
+    url: '/business/marketingActivity/record/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/cardSet.js
+++ b/fuintAdmin/src/api/EventMarketing/cardSet.js
@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 分页查询列表
+export function getCountOilTypeApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel/countOilType',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询余额券
+export function getCardValueListApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardValue',
+    method: 'get',
+    params: query
+  })
+}
+
+// 余额支付
+export function getPrepaidCardTopUpApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardValueRecord/prepaidCardTopUp',
+    method: 'post',
+    data: query
+  })
+}
+
+// 余额插入订单
+export function getCheckTheStatusOfYourPaymentApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardValueRecord/checkTheStatusOfYourPayment?id='+query,
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+
+// 余额支付  油卡
+export function getPrepaidFuelTopUpApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardFuelRecord/prepaidFuelTopUp',
+    method: 'post',
+    data: query
+  })
+}
+
+// 余额插入订单 油卡
+export function getCheckTheStatusOfYourPaymentByFuelApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardFuelRecord/checkTheStatusOfYourPaymentByFuel?id='+query,
+    method: 'get',
+    params: query
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/giftBlock.js
+++ b/fuintAdmin/src/api/EventMarketing/giftBlock.js
@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+// 分页查询列表
+export function getList(query) {
+  return request({
+    url: 'business/marketingActivity/cardGift',
+    method: 'get',
+    params: query
+  })
+}
+export function getListtj(query) {
+  return request({
+    url: 'business/marketingActivity/cardGift/list/11',
+    method: 'get',
+    params: query
+  })
+}
+export function oilDepotConfiguration(query) {
+  return request({
+    url: 'business/oilDepotConfiguration',
+    method: 'put',
+    data: query
+  })
+}
+// 新增列表
+export function addList(data) {
+  return request({
+    url: 'business/marketingActivity/cardGift',
+    method: 'post',
+    data: data
+  })
+}
+// 修改列表
+export function eitList(data) {
+  return request({
+    url: 'business/marketingActivity/cardGift',
+    method: 'put',
+    data: data
+  })
+}
+//删除列表
+export function deleteList(id) {
+  return request({
+    url: 'business/marketingActivity/cardValue?idList='+id,
+    method: 'delete',
+
+  })
+}
+// 下载
+export function getdownload(query) {
+  return request({
+    url: 'business/marketingActivity/cardGift/export',
+    method: 'get',
+
+  })
+}
+// 查询条件
+export function getsoucondition() {
+  return request({
+    url: 'business/marketingActivity/cardGift',
+    method: 'get',
+
+  })
+}
+// 查询统计
+export function getselectGiftValue() {
+  return request({
+    url: 'business/marketingActivity/cardGift/selectGiftValue',
+    method: 'get',
+
+  })
+}
+// 统计
+export function getqb() {
+  return request({
+    url: 'business/marketingActivity/cardGift/countGiftValue',
+    method: 'get',
+  })
+}
+export function getsk(data) {
+  return request({
+    url: 'business/marketingActivity/cardGift',
+    method: 'put',
+    data:data
+  })
+}
+export function getyi() {
+  return request({
+    url: 'business/marketingActivity/cardGift/countGiftValue?useStatus=1',
+    method: 'get',
+  })
+}
+export function getwei() {
+  return request({
+    url: 'business/marketingActivity/cardGift/countGiftValue?useStatus=0',
+    method: 'get',
+  })
+}
--- a/fuintAdmin/src/api/EventMarketing/oilBlock.js
+++ b/fuintAdmin/src/api/EventMarketing/oilBlock.js
@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 分页查询列表
+export function getList(query) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel',
+    method: 'get',
+    params: query
+  })
+}
+// 查询油号
+export function oilName(oilType) {
+  return request({
+    url: '/business/petrolStationManagement/oilNumber/getList2?oilType='+oilType,
+    method: 'get',
+
+  })
+}
+
+// 查询油号
+export function getById(id) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel/'+id,
+    method: 'get',
+  })
+}
+// 新增列表
+export function addList(data) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel',
+    method: 'post',
+    data: data
+  })
+}
+// 修改列表
+export function eitList(data) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel',
+    method: 'put',
+    data: data
+  })
+}
+//删除列表
+export function deleteById(id) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel/'+id,
+    method: 'delete',
+
+  })
+}
+
+export function getoilnum(id) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilPrice/'+id,
+    method: 'get',
+
+  })
+}
+// 统计
+export function getstatistics() {
+  return request({
+    url: 'business/marketingActivity/cardFuelRecord/selectFuelRecordCount',
+    method: 'get',
+
+  })
+}
+
--- a/fuintAdmin/src/api/EventMarketing/yijian.js
+++ b/fuintAdmin/src/api/EventMarketing/yijian.js
@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+
+export function issueCardFavorable(data) {
+  return request({
+    url: 'business/marketingActivity/oneActiveOneCoupon',
+    method: 'post',
+    data:data
+  })
+}
+
+export function getCardFavorableLists(status) {
+  return request({
+    url: 'business/marketingActivity/oneActiveOneCoupon',
+    method: 'get',
+    params: status
+  })
+}
+export function getCardFavorable(id) {
+  return request({
+    url: 'business/marketingActivity/oneActiveOneCoupon/'+id,
+    method: 'get',
+
+  })
+}
+export function updetaCardFavorable(data) {
+  return request({
+    url: 'business/marketingActivity/oneActiveOneCoupon',
+    method: 'put',
+    data:data
+
+  })
+}
+export function deleteCardFavorable(id) {
+  return request({
+    url: 'business/marketingActivity/oneActiveOneCoupon/delById/'+id,
+    method: 'delete',
+
+
+  })
+}
+export function postyijian(data) {
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord/issueCardFavorable',
+    method: 'post',
+    data:data
+
+
+  })
+}
+
+export function getAdaptUserList(data) {
+
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord/getAdaptUserList',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/LodopFuncs.js
+++ b/fuintAdmin/src/api/LodopFuncs.js
@ -0,0 +1,189 @@
+//==本JS是加载Lodop插件或Web打印服务CLodop/Lodop7的综合示例，可直接使用，建议理解后融入自己程序==
+// http://www.c-lodop.com/LodopDemo.html 地址
+//用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占:
+var MainJS = "CLodopfuncs.js",
+  URL_WS1 = "ws://localhost:8000/" + MainJS,                //ws用8000/18000
+  URL_WS2 = "ws://localhost:18000/" + MainJS,
+  URL_HTTP1 = "http://localhost:8000/" + MainJS,              //http用8000/18000
+  URL_HTTP2 = "http://localhost:18000/" + MainJS,
+  URL_HTTP3 = "https://localhost.lodop.net:8443/" + MainJS;   //https用8000/8443
+
+var CreatedOKLodopObject, CLodopIsLocal, LoadJsState;
+
+//==判断是否需要CLodop(那些不支持插件的浏览器):==
+function needCLodop() {
+  try {
+    var ua = navigator.userAgent;
+    if (ua.match(/Windows\sPhone/i) ||
+      ua.match(/iPhone|iPod|iPad/i) ||
+      ua.match(/Android/i) ||
+      ua.match(/Edge\D?\d+/i))
+      return true;
+    var verTrident = ua.match(/Trident\D?\d+/i);
+    var verIE = ua.match(/MSIE\D?\d+/i);
+    var verOPR = ua.match(/OPR\D?\d+/i);
+    var verFF = ua.match(/Firefox\D?\d+/i);
+    var x64 = ua.match(/x64/i);
+    if ((!verTrident) && (!verIE) && (x64)) return true;
+    else if (verFF) {
+      verFF = verFF[0].match(/\d+/);
+      if ((verFF[0] >= 41) || (x64)) return true;
+    } else if (verOPR) {
+      verOPR = verOPR[0].match(/\d+/);
+      if (verOPR[0] >= 32) return true;
+    } else if ((!verTrident) && (!verIE)) {
+      var verChrome = ua.match(/Chrome\D?\d+/i);
+      if (verChrome) {
+        verChrome = verChrome[0].match(/\d+/);
+        if (verChrome[0] >= 41) return true;
+      }
+    }
+    return false;
+  } catch (err) {
+    return true;
+  }
+}
+
+//==检查加载成功与否，如没成功则用http(s)再试==
+//==低版本CLODOP6.561/Lodop7.043及前)用本方法==
+function checkOrTryHttp() {
+  if (window.getCLodop) {
+    LoadJsState = "complete";
+    return true;
+  }
+  if (LoadJsState == "loadingB" || LoadJsState == "complete") return;
+  LoadJsState = "loadingB";
+  var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+  var JS1 = document.createElement("script")
+    , JS2 = document.createElement("script")
+    , JS3 = document.createElement("script");
+  JS1.src = URL_HTTP1;
+  JS2.src = URL_HTTP2;
+  JS3.src = URL_HTTP3;
+  JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror = function () { LoadJsState = "complete"; }
+  JS1.onerror = function (e) {
+    if (window.location.protocol !== 'https:')
+      head.insertBefore(JS2, head.firstChild); else
+      head.insertBefore(JS3, head.firstChild);
+  }
+  head.insertBefore(JS1, head.firstChild);
+}
+
+//==加载Lodop对象的主过程:==
+(function loadCLodop() {
+  if (!needCLodop()) return;
+  CLodopIsLocal = !!((URL_WS1 + URL_WS2).match(/\/\/localho|\/\/127.0.0./i));
+  LoadJsState = "loadingA";
+  if (!window.WebSocket && window.MozWebSocket) window.WebSocket = window.MozWebSocket;
+  //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
+  try {
+    var WSK1 = new WebSocket(URL_WS1);
+    WSK1.onopen = function (e) { setTimeout("checkOrTryHttp();", 200); }
+    WSK1.onmessage = function (e) { if (!window.getCLodop) eval(e.data); }
+    WSK1.onerror = function (e) {
+      var WSK2 = new WebSocket(URL_WS2);
+      WSK2.onopen = function (e) { setTimeout("checkOrTryHttp();", 200); }
+      WSK2.onmessage = function (e) { if (!window.getCLodop) eval(e.data); }
+      WSK2.onerror = function (e) { checkOrTryHttp(); }
+    }
+  } catch (e) {
+    checkOrTryHttp();
+  }
+})();
+
+//==获取LODOP对象主过程,判断是否安装、需否升级:==
+function getLodop(oOBJECT, oEMBED) {
+  var strFontTag = "<br><font color='#FF00FF'>打印控件";
+  var strLodopInstall = strFontTag + "未安装!点击这里<a href='install_lodop32.exe' target='_self'>执行安装</a>";
+  var strLodopUpdate = strFontTag + "需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>";
+  var strLodop64Install = strFontTag + "未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>";
+  var strLodop64Update = strFontTag + "需要升级!点击这里<a href='install_lodop64.exe' target='_self'>执行升级</a>";
+  var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装</a>";
+  var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
+  var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
+  var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";
+  var strLodop7HrefX86 = "点击这里<a href='Lodop7_Linux_X86_64.tar.gz' target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
+  var strLodop7HrefARM = "点击这里<a href='Lodop7_Linux_ARM64.tar.gz'  target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
+  var strLodop7Install_X86 = strLodop7FontTag + "未安装启动，" + strLodop7HrefX86;
+  var strLodop7Install_ARM = strLodop7FontTag + "未安装启动，" + strLodop7HrefARM;
+  var strLodop7Update_X86 = strLodop7FontTag + "需升级，" + strLodop7HrefX86;
+  var strLodop7Update_ARM = strLodop7FontTag + "需升级，" + strLodop7HrefARM;
+  var strInstallOK = "，成功后请刷新本页面或重启浏览器。</font>";
+  var LODOP;
+  try {
+    var isWinIE = (/MSIE/i.test(navigator.userAgent)) || (/Trident/i.test(navigator.userAgent));
+    var isWinIE64 = isWinIE && (/x64/i.test(navigator.userAgent));
+    var isLinuxX86 = (/Linux/i.test(navigator.platform)) && (/x86/i.test(navigator.platform));
+    var isLinuxARM = (/Linux/i.test(navigator.platform)) && (/aarch/i.test(navigator.platform));
+
+    if (needCLodop() || isLinuxX86 || isLinuxARM) {
+      try {
+        LODOP = window.getCLodop();
+      } catch (err) { }
+      if (!LODOP && LoadJsState !== "complete") {
+        if (!LoadJsState)
+          alert("未曾加载Lodop主JS文件，请先调用loadCLodop过程."); else
+          alert("网页还没下载完毕，请稍等一下再操作.");
+        return;
+      }
+      var strAlertMessage;
+      if (!LODOP) {
+        if (isLinuxX86)
+          strAlertMessage = strLodop7Install_X86;
+        else if (isLinuxARM)
+          strAlertMessage = strLodop7Install_ARM;
+        else
+          strAlertMessage = strCLodopInstallA + (CLodopIsLocal ? strCLodopInstallB : "");
+        document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
+        return;
+      } else {
+        if (isLinuxX86 && LODOP.CVERSION < "7.0.4.3")
+          strAlertMessage = strLodop7Update_X86;
+        else if (isLinuxARM && LODOP.CVERSION < "7.0.4.3")
+          strAlertMessage = strLodop7Update_ARM;
+        else if (CLODOP.CVERSION < "6.5.7.1")
+          strAlertMessage = strCLodopUpdate;
+
+        if (strAlertMessage)
+          document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
+      }
+      // LODOP.SET_LICENSES("", "EE0887D00FCC7D29375A695F728489A6", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+    } else {
+      //==如果页面有Lodop插件就直接使用,否则新建:==
+      if (oOBJECT || oEMBED) {
+        if (isWinIE)
+          LODOP = oOBJECT;
+        else
+          LODOP = oEMBED;
+      } else if (!CreatedOKLodopObject) {
+        LODOP = document.createElement("object");
+        LODOP.setAttribute("width", 0);
+        LODOP.setAttribute("height", 0);
+        LODOP.setAttribute("style", "position:absolute;left:0px;top:-100px;width:0px;height:0px;");
+        if (isWinIE)
+          LODOP.setAttribute("classid", "clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
+        else
+          LODOP.setAttribute("type", "application/x-print-lodop");
+        document.documentElement.appendChild(LODOP);
+        CreatedOKLodopObject = LODOP;
+      } else
+        LODOP = CreatedOKLodopObject;
+      //==Lodop插件未安装时提示下载地址:==
+      if ((!LODOP) || (!LODOP.VERSION)) {
+        document.body.innerHTML = (isWinIE64 ? strLodop64Install : strLodopInstall) + strInstallOK + document.body.innerHTML;
+        return LODOP;
+      }
+      if (LODOP.VERSION < "6.2.2.6") {
+        document.body.innerHTML = (isWinIE64 ? strLodop64Update : strLodopUpdate) + strInstallOK + document.body.innerHTML;
+      }
+    }
+    //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
+
+    LODOP.SET_LICENSES("", "EE0887D00FCC7D29375A695F728489A6", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+    //===============================================================================
+    return LODOP;
+  } catch (err) {
+    alert("getLodop出错:" + err);
+  }
+}
+export { getLodop };
--- a/fuintAdmin/src/api/allOrder.js
+++ b/fuintAdmin/src/api/allOrder.js
@ -0,0 +1,147 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getOrderListApi(query) {
+  return request({
+      url: 'business/allOrderInfo/getPageList',
+      method: 'get',
+      params: query
+
+  })
+}
+// 分页查询所有的订单信息
+export function getSumPayMoneyApi(query) {
+  return request({
+      url: 'business/allOrderInfo/sumPayMoney',
+      method: 'get',
+      params: query
+
+  })
+}
+
+// 查询订单信息
+export function getOrderInfo(orderId) {
+  return request({
+    url: 'backendApi/order/info/' + orderId,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getTradingPageApi(query) {
+  return request({
+    url: 'business/allOrderInfo/trading',
+    method: 'get',
+    params: query
+
+  })
+}
+export function getInstituionListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByInstituion',
+    method: 'get',
+    params: query
+
+  })
+}
+
+export function getNoneListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByNone',
+    method: 'get',
+    params: query
+
+  })
+}
+
+export function getDayListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByDay',
+    method: 'get',
+    params: query
+
+  })
+}
+export function getDayDatyListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/getRunningWaterByDayData',
+    method: 'get',
+    params: query
+
+  })
+}
+//统计
+export function getRunningWaterByDataApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByData',
+    method: 'get',
+    params: query
+
+  })
+}
+//统计
+export function getRunningWaterByTissueApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByTissue',
+    method: 'get',
+    params: query
+
+  })
+}
+
+export function getmyDataApi(query) {
+  return request({
+    url: 'business/allOrderInfo/getmyData',
+    method: 'get',
+    params: query
+
+  })
+}
+
+//统计
+export function getTissueByDataApi(query) {
+  return request({
+    url: 'business/allOrderInfo/getTradingData',
+    method: 'get',
+    params: query
+
+  })
+}
+
+
+export function exportExcelTradingApi(data) {
+  return request({
+    url: 'business/allOrderInfo/tradingExportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+
+export function exportExcelTissueApi(data) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByTissueExportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+export function exportExcelOilDeptApi(data) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByOilDeptExportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+export function exportExcelDayApi(data) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByDayExportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
--- a/fuintAdmin/src/api/article.js
+++ b/fuintAdmin/src/api/article.js
@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 分页查询文章列表
+export function getArticleList(query) {
+  return request({
+      url: 'backendApi/article/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询文章信息
+export function getArticle(articleId) {
+  return request({
+    url: 'backendApi/article/info/' + articleId,
+    method: 'get'
+  })
+}
+
+// 更新文章状态
+export function updateStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/article/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 保存数据
+export function saveArticle(data) {
+  return request({
+    url: 'backendApi/article/save',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/balance.js
+++ b/fuintAdmin/src/api/balance.js
@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+// 分页查询余额明细列表
+export function getBalanceList(query) {
+  return request({
+      url: 'backendApi/balance/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询明细详情
+export function getBalanceInfo(memberId) {
+  return request({
+    url: 'backendApi/balance/info/' + memberId,
+    method: 'get'
+  })
+}
+
+// 更新状态
+export function updateBalanceStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/balance/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 获取配置信息
+export function getSettingInfo() {
+  return request({
+    url: 'backendApi/balance/setting',
+    method: 'get'
+  })
+}
+
+// 保存配置
+export function saveSetting(data) {
+  return request({
+    url: 'backendApi/balance/saveSetting',
+    method: 'post',
+    data: data
+  })
+}
+
+// 确定充值
+export function doRecharge(data) {
+  return request({
+    url: 'backendApi/balance/doRecharge',
+    method: 'post',
+    data: data
+  })
+}
+
--- a/fuintAdmin/src/api/banner.js
+++ b/fuintAdmin/src/api/banner.js
@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 分页查询banner列表
+export function getBannerList(query) {
+  return request({
+      url: 'backendApi/banner/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询banner信息
+export function getBannerInfo(bannerId) {
+  return request({
+    url: 'backendApi/banner/info/' + bannerId,
+    method: 'get'
+  })
+}
+
+// 更新banner状态
+export function updateBannerStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/banner/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 保存数据
+export function saveBanner(data) {
+  return request({
+    url: 'backendApi/banner/save',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/cashier.js
+++ b/fuintAdmin/src/api/cashier.js
@ -0,0 +1,123 @@
+import request from '@/utils/request'
+
+// 初始化数据
+export function init(userId) {
+  return request({
+      url: 'backendApi/cashier/init/' + userId,
+      method: 'get'
+  })
+}
+
+// 查询商品详情
+export function getGoodsInfo(goodsId) {
+  return request({
+    url: 'backendApi/cashier/getGoodsInfo/' + goodsId,
+    method: 'get'
+  })
+}
+
+// 查询商品
+export function searchGoods(data) {
+  return request({
+    url: 'backendApi/cashier/searchGoods',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询会员信息
+export function getMemberInfo(data) {
+  return request({
+    url: 'backendApi/cashier/getMemberInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询会员信息
+export function getMemberInfoById(userId) {
+  return request({
+    url: 'backendApi/cashier/getMemberInfoById/' + userId,
+    method: 'get'
+  })
+}
+
+// 获取购物车列表
+export function getCartList(data) {
+  return request({
+    url: 'clientApi/cart/list',
+    method: 'post',
+    data: data
+  })
+}
+
+// 保存购物车
+export function saveCart(data) {
+  return request({
+    url: 'clientApi/cart/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除购物车
+export function removeFromCart(data) {
+  return request({
+    url: 'clientApi/cart/clear',
+    method: 'post',
+    data: data
+  })
+}
+
+// 提交结算
+export function submitSettlement(data) {
+  return request({
+    url: 'clientApi/settlement/submit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 发起支付
+export function doPay(params) {
+  return request({
+    url: 'clientApi/pay/doPay',
+    method: 'get',
+    params: params
+  })
+}
+
+// 获取订单列表
+export function getOrderList(data) {
+  return request({
+    url: 'backendApi/order/latest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 执行挂单
+export function doHangUp(data) {
+  return request({
+    url: 'backendApi/cashier/doHangUp',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取挂单
+export function getHangUpList() {
+  return request({
+    url: 'backendApi/cashier/getHangUpList',
+    method: 'get'
+  })
+}
+
+// 删除挂单
+export function removeHangUp(data) {
+  return request({
+    url: 'clientApi/cart/clear',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/commission/log.js
+++ b/fuintAdmin/src/api/commission/log.js
@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询员工提成统计列表
+export function getStaffStatistics(query) {
+  return request({
+    url: 'backendApi/commissionLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工提成统计列表
+export function getStaffStatisticsDetail(query) {
+  return request({
+    url: 'backendApi/commissionLog/list',
+    method: 'get',
+    params: query
+  })
+}
--- a/fuintAdmin/src/api/commission/rule.js
+++ b/fuintAdmin/src/api/commission/rule.js
@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 分页查询分销提成规则列表
+export function getCommissionRuleList(query) {
+  return request({
+      url: 'backendApi/commissionRule/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询分销提成规则详情
+export function getCommissionRuleInfo(ruleId) {
+  return request({
+     url: 'backendApi/commissionRule/info/' + ruleId,
+     method: 'get'
+  })
+}
+
+// 更新分销提成规则状态
+export function updateCommissionRuleStatus(ruleId, status) {
+  const data = { ruleId, status }
+  return request({
+     url: 'backendApi/commissionRule/updateStatus',
+     method: 'post',
+     data: data
+  })
+}
+
+// 保存分销提成规则
+export function saveCommissionRule(data) {
+  return request({
+     url: 'backendApi/commissionRule/save',
+     method: 'post',
+     data: data
+  })
+}
+
+// 选择商品列表
+export function selectGoodList(query) {
+  return request({
+    url: 'backendApi/commissionRule/selectGoodList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除信息
+export function removeCommissionRule(data) {
+  return request({
+    url: 'backendApi/commissionRule/remove',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/damage.js
+++ b/fuintAdmin/src/api/convenienceStore/damage.js
@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+
+/**
+ * 订单
+ */
+
+export function getDamagePageApi(query) {
+  return request({
+    url: '/business/convenience/mtDamage/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+// 新增
+export function addDamageApi(data) {
+  return request({
+    url: '/business/convenience/mtDamage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function editDamageApi(data) {
+  return request({
+    url: '/business/convenience/mtDamage',
+    method: 'put',
+    data: data
+  })
+}
+
+
+/**
+ * 订单详情
+ */
+
+export function getDamageDetailsPageApi(query) {
+  return request({
+    url: '/business/convenience/mtDamageDetails/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+
+export function delDetailsApi(query) {
+  return request({
+    url: '/business/convenience/mtDamageDetails',
+    method: 'delete',
+    params: query
+  })
+}
+
+export function batchProcessingApi(data) {
+  return request({
+    url: '/business/convenience/mtDamageDetails/batchProcessing',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核
+export function auditDamageApi(data) {
+  return request({
+    url: 'business/convenience/mtDamage/audit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 入库
+export function storageDamageApi(data) {
+  return request({
+    url: 'business/convenience/mtDamage/storage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 作废
+export function abolitionDamageApi(data) {
+  return request({
+    url: 'business/convenience/mtDamage/abolition',
+    method: 'get',
+    params: data
+  })
+}
+
+// 导出信息
+export function exportExcelApi(data) {
+  return request({
+    url: '/business/convenience/mtDamageDetails/exportExcel',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/goods.js
+++ b/fuintAdmin/src/api/convenienceStore/goods.js
@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 新增商品分类
+export function insertCvsGoods(data) {
+    return request({
+      url: '/business/cvsGoods/addCvsGoods',
+      method: 'post',
+      data: data
+    })
+  }
+
+  // 分页查询分类
+export function selectTree(data) {
+    return request({
+      url: '/business/cvsGoods/selectTree',
+      method: 'get',
+      params: data
+    })
+  }
+
+// 联级选择器 树形数据结构
+export function cvsGoodsTree() {
+  return request({
+    url: '/business/cvsGoods/tree',
+    method: 'get',
+  })
+}
+
+// 联级选择器 树形数据结构
+export function cvsGoodsAll() {
+  return request({
+    url: '/business/cvsGoods',
+    method: 'get',
+  })
+}
+
+// 查询一级分类
+export function list(data) {
+  return request({
+    url: '/business/cvsGoods/list',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据id查询一级分类
+export function selectParentById(id) {
+  return request({
+    url: '/business/cvsGoods/'+id,
+    method: 'get',
+  })
+}
+
+// 修改会员
+export function updateCevGood(data) {
+  return request({
+    url: '/business/cvsGoods',
+    method: 'put',
+    data: data
+  })
+}
+
+// 根据id查询一级分类
+export function deleteBYId(id) {
+  return request({
+    url: '/business/cvsGoods/'+id,
+    method: 'delete',
+  })
+}
+
+
--- a/fuintAdmin/src/api/convenienceStore/inventory.js
+++ b/fuintAdmin/src/api/convenienceStore/inventory.js
@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+
+/**
+ * 订单
+ */
+
+export function getInventoryPageApi(query) {
+  return request({
+    url: '/business/convenience/mtInventory/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+// 新增
+export function addInventoryApi(data) {
+  return request({
+    url: '/business/convenience/mtInventory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function editInventoryApi(data) {
+  return request({
+    url: '/business/convenience/mtInventory',
+    method: 'put',
+    data: data
+  })
+}
+
+
+/**
+ * 订单详情
+ */
+
+export function getInventoryDetailsPageApi(query) {
+  return request({
+    url: '/business/convenience/mtInventoryDetails/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+
+export function delDetailsApi(query) {
+  return request({
+    url: '/business/convenience/mtInventoryDetails',
+    method: 'delete',
+    params: query
+  })
+}
+
+export function batchProcessingApi(data) {
+  return request({
+    url: '/business/convenience/mtInventoryDetails/batchProcessing',
+    method: 'post',
+    data: data
+  })
+}
+
+// 审核
+export function auditInventoryApi(data) {
+  return request({
+    url: 'business/convenience/mtInventory/audit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 入库
+export function storageInventoryApi(data) {
+  return request({
+    url: 'business/convenience/mtInventory/storage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 作废
+export function abolitionInventoryApi(data) {
+  return request({
+    url: 'business/convenience/mtInventory/abolition',
+    method: 'get',
+    params: data
+  })
+}
+
+
+
+// 导出信息
+export function exportExcelApi(data) {
+  return request({
+    url: '/business/convenience/mtInventoryDetails/exportExcel',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
+
+export function getSalesByMtInventoryApi(data) {
+  return request({
+    url: 'business/convenience/mtInventoryDetails/getSalesByMtInventory',
+    method: 'get',
+    params: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/ljgoods.js
+++ b/fuintAdmin/src/api/convenienceStore/ljgoods.js
@ -0,0 +1,88 @@
+import request from '@/utils/request'
+
+// 查询商品列表
+export function listLJGoods(query) {
+  return request({
+    url: '/business/convenience/goods/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品列表
+export function queryGoodsVoList(query) {
+  return request({
+    url: '/business/convenience/goods/queryGoodsVoList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品详细
+export function getLJGoods(id) {
+  return request({
+    url: '/business/convenience/goods/' + id,
+    method: 'get'
+  })
+}
+
+// 根据商品条码查询商品详细
+export function queryLJGoods(data) {
+  return request({
+    url: '/business/convenience/goods/getGoods',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生成13位二维码
+export function createGoodsNo() {
+  return request({
+    url: '/business/convenience/goods/createGoodsNo',
+    method: 'get'
+  })
+}
+
+// 对接扫码枪
+export function scanCode(goodsNo) {
+  return request({
+    url: '/business/convenience/goods/scanCode/'+goodsNo,
+    method: 'get',
+    // data: data
+  })
+}
+
+// 新增商品
+export function addLJGoods(data) {
+  return request({
+    url: '/business/convenience/goods',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商品
+export function updateLJGoods(data) {
+  return request({
+    url: '/business/convenience/goods',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品
+export function delLJGoods(id) {
+  return request({
+    url: '/business/convenience/goods/' + id,
+    method: 'delete'
+  })
+}
+
+// 根据商品条码查询商品详细
+export function editStatus(data) {
+  return request({
+    url: '/business/convenience/goods/edit',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/purchase.js
+++ b/fuintAdmin/src/api/convenienceStore/purchase.js
@ -0,0 +1,102 @@
+import request from '@/utils/request'
+
+
+/**
+ * 订单
+ */
+
+export function getPurchasePageApi(query) {
+  return request({
+    url: '/business/convenience/mtPurchase/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+// 新增
+export function addPurchaseApi(data) {
+  return request({
+    url: '/business/convenience/mtPurchase',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function editPurchaseApi(data) {
+  return request({
+    url: '/business/convenience/mtPurchase',
+    method: 'put',
+    data: data
+  })
+}
+
+
+/**
+ * 订单详情
+ */
+
+export function getPurchaseDetailsPageApi(query) {
+  return request({
+    url: '/business/convenience/mtPurchaseDetails/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+
+export function delDetailsApi(query) {
+  return request({
+    url: '/business/convenience/mtPurchaseDetails',
+    method: 'delete',
+    params: query
+  })
+}
+
+export function batchProcessingApi(data) {
+  return request({
+    url: '/business/convenience/mtPurchaseDetails/batchProcessing',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+
+
+// 审核
+export function auditPurchaseApi(data) {
+  return request({
+    url: 'business/convenience/mtPurchase/audit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 入库
+export function storagePurchaseApi(data) {
+  return request({
+    url: 'business/convenience/mtPurchase/storage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 作废
+export function abolitionPurchaseApi(data) {
+  return request({
+    url: 'business/convenience/mtPurchase/abolition',
+    method: 'get',
+    params: data
+  })
+}
+
+
+// 导出库存统计信息
+export function exportExcelApi(data) {
+  return request({
+    url: '/business/convenience/mtPurchaseDetails/exportExcel',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/returns.js
+++ b/fuintAdmin/src/api/convenienceStore/returns.js
@ -0,0 +1,99 @@
+import request from '@/utils/request'
+
+
+/**
+ * 订单
+ */
+
+export function getReturnsPageApi(query) {
+  return request({
+    url: '/business/convenience/mtReturns/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+// 新增
+export function addReturnsApi(data) {
+  return request({
+    url: '/business/convenience/mtReturns',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function editReturnsApi(data) {
+  return request({
+    url: '/business/convenience/mtReturns',
+    method: 'put',
+    data: data
+  })
+}
+
+
+/**
+ * 订单详情
+ */
+
+export function getReturnsDetailsPageApi(query) {
+  return request({
+    url: '/business/convenience/mtReturnsDetails/getListByPage',
+    method: 'get',
+    params: query
+  })
+}
+
+export function delDetailsApi(query) {
+  return request({
+    url: '/business/convenience/mtReturnsDetails',
+    method: 'delete',
+    params: query
+  })
+}
+
+export function batchProcessingApi(data) {
+  return request({
+    url: '/business/convenience/mtReturnsDetails/batchProcessing',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核
+export function auditReturnsApi(data) {
+  return request({
+    url: 'business/convenience/mtReturns/audit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 入库
+export function storageReturnsApi(data) {
+  return request({
+    url: 'business/convenience/mtReturns/storage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 作废
+export function abolitionReturnsApi(data) {
+  return request({
+    url: 'business/convenience/mtReturns/abolition',
+    method: 'get',
+    params: data
+  })
+}
+
+
+// 导出信息
+export function exportExcelApi(data) {
+  return request({
+    url: '/business/convenience/mtReturnsDetails/exportExcel',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/saledetail.js
+++ b/fuintAdmin/src/api/convenienceStore/saledetail.js
@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询库存统计列表
+export function listSaleDetail(query) {
+  return request({
+    url: '/business/convenience/saleDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
--- a/fuintAdmin/src/api/convenienceStore/salestatistic.js
+++ b/fuintAdmin/src/api/convenienceStore/salestatistic.js
@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+// 查询销售统计信息
+export function listSale(query) {
+  return request({
+    url: '/business/convenience/saleStatistic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出销售统计信息
+export function exportSale(data) {
+  return request({
+    url: '/business/convenience/saleStatistic/export',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/stockstatistic.js
+++ b/fuintAdmin/src/api/convenienceStore/stockstatistic.js
@ -0,0 +1,30 @@
+import request from '@/utils/request'
+
+// 查询库存统计列表
+export function listStock(query) {
+  return request({
+    url: '/business/convenience/stockStatistic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库存统计详细
+export function getStock(id) {
+  return request({
+    url: '/business/convenience/stockStatistic/' + id,
+    method: 'get'
+  })
+}
+
+
+// 导出库存统计信息
+export function exportStocks(data) {
+  return request({
+    url: '/business/convenience/stockStatistic/export',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
+
--- a/fuintAdmin/src/api/convenienceStore/stocktrack.js
+++ b/fuintAdmin/src/api/convenienceStore/stocktrack.js
@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询商品列表
+export function listTrack(query) {
+  return request({
+    url: '/business/convenience/stockTrack/list',
+    method: 'get',
+    params: query
+  })
+}
--- a/fuintAdmin/src/api/convenienceStore/supplier.js
+++ b/fuintAdmin/src/api/convenienceStore/supplier.js
@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询供应商列表
+export function listSupplier(query) {
+  return request({
+    url: '/business/convenience/supplier/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供应商列表
+export function listSuppliers(query) {
+  return request({
+    url: '/business/convenience/supplier/lists',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供应商详细
+export function getSupplier(id) {
+  return request({
+    url: '/business/convenience/supplier/' + id,
+    method: 'get'
+  })
+}
+
+// 新增供应商
+export function querySupplier(data) {
+  return request({
+    url: '/business/convenience/supplier/byName',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增供应商
+export function addSupplier(data) {
+  return request({
+    url: '/business/convenience/supplier',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供应商
+export function updateSupplier(data) {
+  return request({
+    url: '/business/convenience/supplier',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商
+export function delSupplier(id) {
+  return request({
+    url: '/business/convenience/supplier/' + id,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/coupon/confirmLog.js
+++ b/fuintAdmin/src/api/coupon/confirmLog.js
@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 分页查询核销流水列表
+export function getConfirmLogList(query) {
+  return request({
+      url: 'backendApi/confirmLog/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 撤销已使用的卡券
+export function rollbackUserCoupon(id, userCouponId) {
+  return request({
+    url: 'backendApi/confirmLog/rollbackUserCoupon/' + id + '?userCouponId=' + userCouponId,
+    method: 'get',
+  })
+}
--- a/fuintAdmin/src/api/coupon/coupon.js
+++ b/fuintAdmin/src/api/coupon/coupon.js
@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 分页查询卡券列表
+export function getCouponList(query) {
+  return request({
+      url: 'backendApi/coupon/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询卡券信息
+export function getCouponInfo(id) {
+  return request({
+    url: 'backendApi/coupon/info/' + id,
+    method: 'get'
+  })
+}
+
+// 更新状态
+export function updateCouponStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/coupon/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 删除卡券
+export function deleteCoupon(id) {
+  return request({
+    url: 'backendApi/coupon/delete/' + id,
+    method: 'get'
+  })
+}
+
+// 保存卡券
+export function saveCoupon(data) {
+  return request({
+    url: 'backendApi/coupon/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询卡券核销信息
+export function getConfirmInfo(data) {
+  return request({
+    url: 'backendApi/doConfirm/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 执行核销
+export function doConfirm(data) {
+  return request({
+    url: 'backendApi/doConfirm/doConfirm',
+    method: 'post',
+    data: data
+  })
+}
+
+// 发放卡券
+export function sendCoupon(params) {
+  return request({
+    url: 'backendApi/coupon/sendCoupon',
+    method: 'get',
+    params: params
+  })
+}
--- a/fuintAdmin/src/api/coupon/give.js
+++ b/fuintAdmin/src/api/coupon/give.js
@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 分页查询转赠记录列表
+export function getGiveLogList(query) {
+  return request({
+      url: 'backendApi/give/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 获取转赠详情
+export function getGiveItem(id) {
+  return request({
+      url: 'backendApi/give/giveItem?giveId=' + id,
+      method: 'get',
+  })
+}
--- a/fuintAdmin/src/api/coupon/group.js
+++ b/fuintAdmin/src/api/coupon/group.js
@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 分页查询卡券分组列表
+export function getGroupList(query) {
+  return request({
+      url: 'backendApi/couponGroup/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询卡券分组列表
+export function getAllGroupList(query) {
+  return request({
+    url: 'backendApi/couponGroup/quickSearch',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询分组信息
+export function getGroupInfo(id) {
+  return request({
+    url: 'backendApi/couponGroup/info/' + id,
+    method: 'get'
+  })
+}
+
+// 更新状态
+export function updateGroupStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/couponGroup/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 删除卡券分组
+export function deleteGroup(id) {
+  return request({
+    url: 'backendApi/couponGroup/delete/' + id,
+    method: 'get'
+  })
+}
+
+// 保存卡券分组数据
+export function saveGroup(data) {
+  return request({
+    url: 'backendApi/couponGroup/save',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/coupon/sendLog.js
+++ b/fuintAdmin/src/api/coupon/sendLog.js
@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 分页查询发券记录列表
+export function getSendLogList(query) {
+  return request({
+      url: 'backendApi/sendLog/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 撤销已发放的卡券
+export function removeUserCoupon(id) {
+  return request({
+    url: 'backendApi/sendLog/removeUserCoupon/' + id,
+    method: 'get',
+  })
+}
--- a/fuintAdmin/src/api/coupon/userCoupon.js
+++ b/fuintAdmin/src/api/coupon/userCoupon.js
@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 分页查询会员卡券列表
+export function getUserCouponList(query) {
+  return request({
+      url: 'backendApi/userCoupon/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 作废会员卡券
+export function deleteUserCoupon(id) {
+  return request({
+      url: 'backendApi/userCoupon/delete/' + id,
+      method: 'get',
+  })
+}
+
--- a/fuintAdmin/src/api/dict/type.js
+++ b/fuintAdmin/src/api/dict/type.js
@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/system/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'delete'
+  })
+}
+
+// 刷新字典缓存
+export function refreshCache() {
+  return request({
+    url: '/system/dict/type/refreshCache',
+    method: 'delete'
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/system/dict/type/optionselect',
+    method: 'get'
+  })
+}
--- a/fuintAdmin/src/api/duty/duty.js
+++ b/fuintAdmin/src/api/duty/duty.js
@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 分页查询角色信息
+export function dutyList(query) {
+  return request({
+    url: '/business/member/duty',
+    method: 'get',
+    params: query
+  })
+}
+// 分页查询角色信息
+export function dutyLists(query) {
+  return request({
+    url: '/business/member/duty/dutys',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据id删除角色信息
+export function dutyDelete(id) {
+  return request({
+    url: '/business/member/duty/'+id,
+    method: 'delete',
+  })
+}
+
+// 根据id删除角色信息
+export function dutyEdit(data) {
+  return request({
+    url: '/business/member/duty',
+    method: 'put',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/favourable/favourable.js
+++ b/fuintAdmin/src/api/favourable/favourable.js
@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 分页查询
+export function getFavourableList(query) {
+  return request({
+    url: 'business/marketingActivity/favorableRecords',
+    method: 'get',
+    params: query
+
+  })
+}
+// 分页查询
+export function getCount(query) {
+  return request({
+    url: 'business/marketingActivity/favorableRecords/count',
+    method: 'get',
+
+  })
+}
--- a/fuintAdmin/src/api/feedback/feedBack.js
+++ b/fuintAdmin/src/api/feedback/feedBack.js
@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询挂账信息列表
+export function listFeekBack(query) {
+  return request({
+    url: '/business/userManager/feedback/list',
+    method: 'get',
+    params: query
+  })
+}
--- a/fuintAdmin/src/api/fleet/fleetconsumerecord.js
+++ b/fuintAdmin/src/api/fleet/fleetconsumerecord.js
@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getFleetConsumeRecordList(query) {
+  return request({
+    url: 'fleetConsumeRecord',
+    method: 'get',
+    params: query
+
+  })
+}
+
+// 分页查询所有的订单信息
+export function getFleetConsumeRecord(id) {
+  return request({
+    url: 'fleetConsumeRecord/'+id,
+    method: 'get',
+  })
+}
+
+// 分页查询所有的订单信息
+export function addFleetConsumeRecord(data) {
+  return request({
+    url: 'fleetConsumeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 分页查询所有的订单信息
+export function editFleetConsumeRecord(data) {
+  return request({
+    url: 'fleetConsumeRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 分页查询所有的订单信息
+export function deleteFleetConsumeRecord(id) {
+  return request({
+    url: 'fleetConsumeRecord/'+id,
+    method: 'delete',
+  })
+}
--- a/fuintAdmin/src/api/fleet/fleetinfo.js
+++ b/fuintAdmin/src/api/fleet/fleetinfo.js
@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getFleetInfoList(query) {
+  return request({
+    url: 'fleetInfo',
+    method: 'get',
+    params: query
+
+  })
+}
+
+// 分页查询所有的订单信息
+export function getFleetInfo(id) {
+  return request({
+    url: 'fleetInfo/'+id,
+    method: 'get',
+  })
+}
+
+// 分页查询所有的订单信息
+export function addFleetInfo(data) {
+  return request({
+    url: 'fleetInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 分页查询所有的订单信息
+export function editFleetInfo(data) {
+  return request({
+    url: 'fleetInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 分页查询所有的订单信息
+export function deleteFleetInfo(id) {
+  return request({
+    url: 'fleetInfo/'+id,
+    method: 'delete',
+  })
+}
--- a/fuintAdmin/src/api/fleet/fleetmember.js
+++ b/fuintAdmin/src/api/fleet/fleetmember.js
@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 分页查询所有的车队成员信息
+export function getFleetMemberList(query) {
+  return request({
+    url: 'fleetMember',
+    method: 'get',
+    params: query
+
+  })
+}
+
+// 根据id查询车队成员信息
+export function getFleetMember(id) {
+  return request({
+    url: 'fleetMember/'+id,
+    method: 'get',
+  })
+}
+
+// 添加车队成员信息
+export function addFleetMember(data) {
+  return request({
+    url: 'fleetMember',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改车队成员信息
+export function editFleetMember(data) {
+  return request({
+    url: 'fleetMember',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除车队成员信息
+export function deleteFleetMember(id) {
+  return request({
+    url: 'fleetMember/'+id,
+    method: 'delete',
+  })
+}
+
+
+// 注销车队成员信息
+export function logOffFleetMember(id) {
+  return request({
+    url: 'fleetMember/logOff/'+id,
+    method: 'get',
+  })
+}
--- a/fuintAdmin/src/api/giftCard/giftcard.js
+++ b/fuintAdmin/src/api/giftCard/giftcard.js
@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 测试支付接口
+export function giftCardExchange(query) {
+  return request({
+    url: '/business/marketingActivity/cardGift/exchange',
+    method: 'get',
+    data:query
+  })
+}
--- a/fuintAdmin/src/api/goods.js
+++ b/fuintAdmin/src/api/goods.js
@ -0,0 +1,85 @@
+import request from '@/utils/request'
+
+// 分页查询商品列表
+export function getGoodsList(query) {
+  return request({
+      url: 'backendApi/goods/goods/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询商品详情
+export function getGoodsInfo(goodsId) {
+  return request({
+    url: 'backendApi/goods/goods/info/' + goodsId,
+    method: 'get'
+  })
+}
+
+// 更新状态
+export function updateGoodsStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/goods/goods/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 保存分类数据
+export function saveGoods(data) {
+  return request({
+      url: 'backendApi/goods/goods/save',
+      method: 'post',
+      data: data
+  })
+}
+
+// 保存商品规格名称
+export function saveSpecName(data) {
+  return request({
+      url: 'backendApi/goods/goods/saveSpecName',
+      method: 'post',
+      data: data
+  })
+}
+
+// 保存商品规格值
+export function saveSpecValue(data) {
+  return request({
+      url: 'backendApi/goods/goods/saveSpecValue',
+      method: 'post',
+      data: data
+  })
+}
+
+// 删除商品规格
+export function deleteSpec(query) {
+  return request({
+      url: 'backendApi/goods/goods/deleteSpec',
+      method: 'get',
+      params: query
+  })
+}
+
+// 删除商品规格值
+export function deleteSpecValue(query) {
+  return request({
+      url: 'backendApi/goods/goods/deleteSpecValue',
+      method: 'get',
+      params: query
+  })
+}
+
+// 获取选择商品列表
+export function selectGoodsList(data) {
+  return request({
+     url: 'backendApi/goods/goods/selectGoods',
+     method: 'post',
+     data: data
+  })
+}
--- a/fuintAdmin/src/api/goodsCate.js
+++ b/fuintAdmin/src/api/goodsCate.js
@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 分页查询商品分类列表
+export function getGoodsCateList(query) {
+  return request({
+      url: 'backendApi/goods/cate/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询商品分类详情
+export function getGoodsCateInfo(cateId) {
+  return request({
+    url: 'backendApi/goods/cate/info/' + cateId,
+    method: 'get'
+  })
+}
+
+// 更新状态
+export function updateGoodsCateStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+    url: 'backendApi/goods/cate/updateStatus',
+    method: 'post',
+    data: data
+  })
+}
+
+// 保存分类数据
+export function saveGoodsCate(data) {
+  return request({
+    url: 'backendApi/goods/cate/save',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/handover/handover.js
+++ b/fuintAdmin/src/api/handover/handover.js
@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+export function getHandoverApi() {
+  return request({
+    url: '/business/handoverRecord/handover',
+    method: 'get',
+    // params: query
+  })
+}
+export function getHandoverApi2() {
+  return request({
+    url: '/business/handoverRecord/handover2',
+    method: 'get',
+    // params: query
+  })
+}
+
+export function getHandoverListApi(query) {
+  return request({
+    url: '/business/handoverRecord/queryByPage',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addHandoverApi(data) {
+  return request({
+    url: '/business/handoverRecord',
+    method: 'post',
+    data: data
+  })
+}
+export function printGetHandoverReport(data) {
+  return request({
+    url: 'business/printer/getHandover',
+    method: 'post',
+    data: data
+  })
+}
+export function printLocallyApi(data) {
+  return request({
+    url: '/business/handoverRecord/printLocally',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/home.js
+++ b/fuintAdmin/src/api/home.js
@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获取首页数据
+export function getHomeData() {
+  return request({
+    url: 'backendApi/home/index',
+    method: 'get'
+  })
+}
+
+// 获取统计数据
+export function getStatisticData(query) {
+  return request({
+    url: 'backendApi/home/statistic',
+    method: 'get',
+    params: query
+  })
+}
--- a/fuintAdmin/src/api/indexStatistics.js
+++ b/fuintAdmin/src/api/indexStatistics.js
@ -0,0 +1,68 @@
+
+import request from '@/utils/request'
+
+// 流水统计
+export function turnoverStatisticsApi(query) {
+    return request({
+        url: 'business/oilOrder/turnoverStatistics',
+        method: 'get',
+        params: query
+    })
+}
+  
+// 员工销售
+export function employeeSalesApi(query) {
+    return request({
+        url: 'business/oilOrder/employeeSales',
+        method: 'get',
+        params: query
+    })
+}
+  
+
+  // 储值卡销售额
+export function prepaidCardSalesApi(query) {
+    return request({
+        url: 'business/oilOrder/prepaidCardSales',
+        method: 'get',
+        params: query
+    })
+}
+
+// 屯油卡销售
+export function tunFuelCardSalesApi(query) {
+    return request({
+        url: 'business/oilOrder/tunFuelCardSales',
+        method: 'get',
+        params: query
+    })
+}
+  
+  
+// 商品销售额
+export function merchandiseSalesApi(query) {
+    return request({
+        url: 'business/oilOrder/merchandiseSales',
+        method: 'get',
+        params: query
+    })
+}
+  
+// 油品销售额
+export function oilSalesApi(query) {
+    return request({
+        url: 'business/oilOrder/oilSales',
+        method: 'get',
+        params: query
+    })
+}  
+
+// 各油品销售额
+export function salesByOilProductApi(query) {
+    return request({
+        url: 'business/oilOrder/salesByOilProduct',
+        method: 'get',
+        params: query
+    })
+}
+  
--- a/fuintAdmin/src/api/integral/category.js
+++ b/fuintAdmin/src/api/integral/category.js
@ -0,0 +1,28 @@
+import request from "@/utils/request";
+
+// 查询积分分类
+export function getGiftCategoryApi(data) {
+    return request({
+      url: 'business/integral/integralGiftCategory/queryByPage',
+      method: 'get',
+      params: data
+    })
+  }
+  // 新增有关信息
+  export function insertGiftCategoryApi(data) {
+    return request({
+      url: 'business/integral/integralGiftCategory',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateGiftCategoryApi(data) {
+    return request({
+      url: 'business/integral/integralGiftCategory',
+      method: 'put',
+      data: data
+    })
+  }
+  
+  
--- a/fuintAdmin/src/api/integral/gift.js
+++ b/fuintAdmin/src/api/integral/gift.js
@ -0,0 +1,55 @@
+import request from "@/utils/request";
+
+// 查询油罐列表
+export function getGiftApi(data) {
+    return request({
+      url: 'business/integral/integralGift/queryByPage',
+      method: 'get',
+      params: data
+    })
+  }
+  // 新增有关信息
+  export function insertGiftApi(data) {
+    return request({
+      url: 'business/integral/integralGift',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateGiftApi(data) {
+    return request({
+      url: 'business/integral/integralGift',
+      method: 'put',
+      data: data
+    })
+  }
+  
+
+  // 修改库存
+  export function updateGiftInventoryApi(data) {
+    return request({
+      url: 'business/integral/integralGift/updateInventory',
+      method: 'get',
+      params: data
+    })
+  }
+    
+  
+  //兑换券
+  export function getCardFavorableApi(data) {
+    return request({
+      url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10',
+      method: 'get',
+      params: data
+    })
+  }
+    
+  //优惠券
+  export function getCardExchangeApi(data) {
+    return request({
+      url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10',
+      method: 'get',
+      params: data
+    })
+  }
--- a/fuintAdmin/src/api/integral/order.js
+++ b/fuintAdmin/src/api/integral/order.js
@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+// 查询列表
+export function getOrderApi(data) {
+    return request({
+      url: 'business/integral/integralOrders/queryByPage',
+      method: 'get',
+      params: data
+    })
+  }
+
+  // 新增有关信息
+  export function insertOrderApi(data) {
+    return request({
+      url: 'business/integral/integralOrders',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateOrderApi(data) {
+    return request({
+      url: 'business/integral/integralOrders',
+      method: 'put',
+      data: data
+    })
+  }
+
+  export function getStatisticsApi(data) {
+    return request({
+      url: 'business/integral/integralOrders/statistics',
+      method: 'get',
+      params: data
+    })
+  }
+
+export function queryByBuyApi(data) {
+  return request({
+    url: 'business/integral/integralOrders/queryByBuy',
+    method: 'get',
+    params: data
+  })
+}
+export function queryByBuySumApi(data) {
+  return request({
+    url: 'business/integral/integralOrders/queryByBuySum',
+    method: 'get',
+    params: data
+  })
+}
+
+
+
--- a/fuintAdmin/src/api/integral/settings.js
+++ b/fuintAdmin/src/api/integral/settings.js
@ -0,0 +1,28 @@
+import request from "@/utils/request";
+
+// 查询油罐列表
+export function getSettingsApi(data) {
+    return request({
+      url: 'business/integral/integralSettings/getSettings',
+      method: 'get',
+      params: data
+    })
+  }
+  // 新增有关信息
+  export function insertSettingsApi(data) {
+    return request({
+      url: 'business/integral/integralSettings',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateSettingsApi(data) {
+    return request({
+      url: 'business/integral/integralSettings',
+      method: 'put',
+      data: data
+    })
+  }
+
+  
--- a/fuintAdmin/src/api/login.js
+++ b/fuintAdmin/src/api/login.js
@ -0,0 +1,72 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function login(username, password, captchaCode, uuid) {
+  const data = {
+    username,
+    password,
+    captchaCode,
+    uuid
+  }
+  return request({
+    url: 'backendApi/login/doLogin',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+// 获取手机验证码
+export function gettelcode(data) {
+  return request({
+    url: 'backendApi/login/sendMsg',
+    method: 'post',
+    data:data
+  })
+}
+export function gettellogin(mobile,code) {
+  const data ={
+    mobile,
+    code
+  }
+  return request({
+    url: 'backendApi/login/loginByPhone',
+    method: 'post',
+    data:data
+  })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return request({
+    url: 'backendApi/login/getInfo',
+    method: 'get'
+  })
+}
+
+// 退出方法
+export function logout() {
+  return request({
+    url: 'backendApi/login/logout',
+    method: 'post'
+  })
+}
+
+// 获取验证码
+export function getCodeImg() {
+  return request({
+    url: 'clientApi/captcha/getCode',
+    method: 'get'
+  })
+}
+
+
+// 单点登录
+export function loginVerificationApi(data) {
+  return request({
+    url: 'backendApi/store/loginVerification',
+    method: 'post',
+    data:data
+  })
+}
--- a/fuintAdmin/src/api/member.js
+++ b/fuintAdmin/src/api/member.js
@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 分页查询会员列表
+export function getMemberList(query) {
+  return request({
+      url: 'backendApi/member/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询会员信息
+export function getMemberInfo(memberId) {
+  return request({
+    url: 'backendApi/member/info/' + memberId,
+    method: 'get'
+  })
+}
+
+// 查询会员设置
+export function getMemberSetting() {
+  return request({
+    url: 'backendApi/member/setting',
+    method: 'get'
+  })
+}
+
+// 保存会员设置
+export function saveSetting(data) {
+  return request({
+    url: 'backendApi/member/saveSetting',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新会员状态
+export function updateMemberStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+      url: 'backendApi/member/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 删除会员信息
+export function deleteMember(memberId) {
+  return request({
+    url: 'backendApi/member/delete/' + memberId,
+    method: 'get'
+  })
+}
+
+// 保存数据
+export function saveMember(data) {
+  return request({
+    url: 'backendApi/member/save',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/menu.js
+++ b/fuintAdmin/src/api/menu.js
@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取路由
+export const getRouters = () => {
+  return request({
+    url: 'backendApi/login/getRouters',
+    method: 'get'
+  })
+}
--- a/fuintAdmin/src/api/merchant.js
+++ b/fuintAdmin/src/api/merchant.js
@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+// 分页查询商户列表
+export function getMerchantList(query) {
+  return request({
+     url: 'backendApi/merchant/list',
+     method: 'get',
+     params: query
+  })
+}
+
+// 查询商户信息
+export function getMerchantInfo(merchantId) {
+  return request({
+     url: 'backendApi/merchant/info/' + merchantId,
+     method: 'get'
+  })
+}
+
+// 查询商户列表
+export function searchMerchant(param) {
+  return request({
+     url: 'backendApi/merchant/searchMerchant',
+     method: 'get',
+     params: param
+  })
+}
+
+// 更新商户状态
+export function updateMerchantStatus(merchantId, status) {
+  const data = {
+     merchantId,
+     status
+  }
+  return request({
+     url: 'backendApi/merchant/updateStatus',
+     method: 'post',
+     data: data
+  })
+}
+
+// 保存商户信息
+export function saveMerchant(data) {
+  return request({
+     url: 'backendApi/merchant/save',
+     method: 'post',
+     data: data
+  })
+}
--- a/fuintAdmin/src/api/oilConfig/oilGuns.js
+++ b/fuintAdmin/src/api/oilConfig/oilGuns.js
@ -0,0 +1,68 @@
+import request from "@/utils/request";
+
+// 查询油罐列表
+export function getGunListpageApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/queryByPage',
+    method: 'get',
+    params: data
+  })
+}
+// 查询油罐列表
+export function getGunApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/selectByNumberTGUn',
+    method: 'get',
+    params: data
+  })
+}
+// 新增有关信息
+export function insertGunApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilGun',
+    method: 'post',
+    data: data
+  })
+}
+// 修改有关信息
+export function updateGunApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilGun',
+    method: 'put',
+    data: data
+  })
+}
+// 根据油号查询油罐
+export function selectTankByNumberApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank/selectList?numberId='+data,
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询油罐列表
+export function delGunApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/',
+    method: 'delete',
+    params: data
+  })
+}
+
+// 查询油罐信息
+export function getOilNumberGun() {
+  return request({
+    url: '/business/petrolStationManagement/oilGun/selectByNumberTGUn',
+    method: 'get',
+  })
+}
+
+// 查询所有油号
+export function oilNumbers() {
+  return request({
+    url: '/business/petrolStationManagement/oilNumber/getOilNumber',
+    method: 'get',
+    // data: data
+  })
+}
--- a/fuintAdmin/src/api/oilConfig/oilInventory.js
+++ b/fuintAdmin/src/api/oilConfig/oilInventory.js
@ -0,0 +1,156 @@
+import request from "@/utils/request";
+
+
+// 进货
+// 查询油罐列表
+export function getInventoryApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilInventory/getListPage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 根据id查询信息
+export function getInventoryByIdApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilInventory/data',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增有关信息
+export function insertInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改有关信息
+export function updateInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除有关信息
+export function delInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventory',
+    method: 'delete',
+    params: data
+  })
+}
+
+
+// 订单
+
+// 查询订单列表
+export function getInventoryOrderApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilInventoryOrder/getListPage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增有关信息
+export function insertInventoryOrderApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder',
+    method: 'post',
+    data: data
+  })
+}
+// 批量有关信息
+export function insertBatchInventoryOrderApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/insertBatch',
+    method: 'post',
+    data: data
+  })
+}
+// 修改有关信息
+export function updateInventoryOrderApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder',
+    method: 'put',
+    data: data
+  })
+}
+// 修改有关信息
+export function editInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/editInventory',
+    method: 'put',
+    data: data
+  })
+}
+// 查询油罐信息
+export function selectList2Api(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank/selectList2',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询油罐信息
+export function getPurchaseByTankIdApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/getPurchaseByTankId',
+    method: 'get',
+    params: data
+  })
+}
+
+// 删除有关信息
+export function delInventoryOrderApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder',
+    method: 'delete',
+    params: data
+  })
+}
+
+// 批量处理数据
+export function disposeBatchApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/disposeBatch',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核
+export function auditInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/audit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 入库
+export function storageInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/storage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 作废
+export function abolitionInventoryApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilInventoryOrder/abolition',
+    method: 'get',
+    params: data
+  })
+}
--- a/fuintAdmin/src/api/oilConfig/oilPurchase.js
+++ b/fuintAdmin/src/api/oilConfig/oilPurchase.js
@ -0,0 +1,122 @@
+import request from "@/utils/request";
+
+
+// 进货
+// 查询油罐列表
+export function getPurchaseApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilPurchase/getList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增有关信息
+export function insertPurchaseApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchase',
+    method: 'post',
+    data: data
+  })
+}
+
+// 处理全部
+export function unifiedProcessingApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchase/unifiedProcessing',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改有关信息
+export function updatePurchaseApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchase',
+    method: 'put',
+    data: data
+  })
+}
+
+
+
+// 订单
+
+// 查询订单列表
+export function getPurchaseOrderApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilPurchaseOrder/getList',
+    method: 'get',
+    params: data
+  })
+}
+// 删除有关信息
+export function delPurchaseOrderApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilPurchaseOrder',
+    method: 'delete',
+    params: data
+  })
+}
+
+// 新增有关信息
+export function insertPurchaseOrderApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder',
+    method: 'post',
+    data: data
+  })
+}
+// 修改有关信息
+export function updatePurchaseOrderApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder',
+    method: 'put',
+    data: data
+  })
+}
+// 修改有关信息
+export function editPurchuseApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder/editPurchuse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 批量处理数据
+export function disposeBatchApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder/disposeBatch',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核
+export function auditApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder/audit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 入库
+export function storageApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder/storage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 作废
+export function abolitionApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPurchaseOrder/abolition',
+    method: 'get',
+    params: data
+  })
+}
--- a/fuintAdmin/src/api/oilConfig/oilStatistics.js
+++ b/fuintAdmin/src/api/oilConfig/oilStatistics.js
@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// 查询列表
+export function getTrackingApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilTracking/queryByPage',
+    method: 'get',
+    params: data
+  })
+}
--- a/fuintAdmin/src/api/oilConfig/oilSuppliers.js
+++ b/fuintAdmin/src/api/oilConfig/oilSuppliers.js
@ -0,0 +1,35 @@
+import request from "@/utils/request";
+
+// 查询供应商列表(分页)
+export function getSuppliersListApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilSuppliers/queryByPage',
+    method: 'get',
+    params: data
+  })
+}
+// 新增有关信息
+export function insertSuppliersApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilSuppliers',
+    method: 'post',
+    data: data
+  })
+}
+// 修改有关信息
+export function updateSuppliersApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilSuppliers',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询供应商列表
+export function getSuppliersListApi2(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilSuppliers/getList',
+    method: 'get',
+    params: data
+  })
+}
--- a/fuintAdmin/src/api/oilConfig/oilTank.js
+++ b/fuintAdmin/src/api/oilConfig/oilTank.js
@ -0,0 +1,58 @@
+import request from "@/utils/request";
+
+// 查询油罐列表
+export function getTankApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilTank/queryByPage',
+    method: 'get',
+    params: data
+  })
+}
+// 新增有关信息
+export function insertTankApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank',
+    method: 'post',
+    data: data
+  })
+}
+// 修改有关信息
+export function updateTankApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 初始化信息
+export function cleanTankApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank/cleanTank',
+    method: 'get',
+    params: data
+  })
+}
+
+// 导出信息
+export function exportExcelTankApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank/exportExcel',
+    method: 'post',
+    responseType:'blob',
+    data: data
+  })
+}
+
+// 导出 Excel 文件
+export function exportExcelTank(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilTank/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+
--- a/fuintAdmin/src/api/oilConfig/staff.js
+++ b/fuintAdmin/src/api/oilConfig/staff.js
@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+//
+export function getAuditPremApi(data) {
+  return request({
+    url: '/business/member/staff/auditPrem',
+    method: 'get',
+    params: data
+  })
+}
--- a/fuintAdmin/src/api/oilPrice.js
+++ b/fuintAdmin/src/api/oilPrice.js
@ -0,0 +1,91 @@
+import request from '@/utils/request'
+
+// 查询油类
+export function getOilNumberList(query) {
+  return request({
+      url: 'business/petrolStationManagement/oilNumber/getList',
+      method: 'get',
+      params: query
+  })
+}
+
+// 新增油类
+export function insertOilNumber(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改油类
+export function updateOilNumber(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber',
+    method: 'put',
+    data: data
+  })
+}
+
+// 字典查询
+export function dictSelect(data) {
+  return request({
+    url: 'system/dict/data/type/'+data,
+    method: 'get',
+    data: data
+  })
+}
+
+//
+export function getOilPresetList(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPresetPrices/getList',
+    method: 'get',
+    data: data
+  })
+}
+
+
+// 查询油品
+export function getOilNameListApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: data
+  })
+}
+// 查询油品名称
+export function getOilNameApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilName/getList',
+    method: 'get',
+    params: data
+  })
+}
+// 查询油品名称
+export function getAllOilListApi(data) {
+  return request({
+    url: '/business/petrolStationManagement/oilName/getOilName',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增预设
+export function insertOilPresePricesApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPresetPrices',
+    method: 'post',
+    data: data
+  })
+}
+
+export function stopJobApi(data) {
+  return request({
+    url: 'business/petrolStationManagement/oilPresetPrices/stopJob',
+    method: 'post',
+    data: data
+  })
+}
+
+
--- a/fuintAdmin/src/api/openGift.js
+++ b/fuintAdmin/src/api/openGift.js
@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+// 分页查询开卡赠礼列表
+export function getOpenGiftList(query) {
+  return request({
+      url: 'backendApi/openGift/list',
+      method: 'get',
+      params: query
+  })
+}
+
+// 查询信息
+export function getOpenGiftInfo(id) {
+  return request({
+    url: 'backendApi/openGift/info/' + id,
+    method: 'get'
+  })
+}
+
+// 更新状态
+export function updateOpenGiftStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+      url: 'backendApi/openGift/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 删除开卡赠礼
+export function deleteOpenGift(id) {
+  return request({
+    url: 'backendApi/openGift/delete/' + id,
+    method: 'get'
+  })
+}
+
+// 保存数据
+export function saveOpenGift(data) {
+  return request({
+    url: 'backendApi/openGift/save',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/order.js
+++ b/fuintAdmin/src/api/order.js
@ -0,0 +1,83 @@
+import request from '@/utils/request'
+
+// 分页查询订单列表
+export function getOrderList(data) {
+  return request({
+      url: 'backendApi/order/list',
+      method: 'post',
+      data: data
+  })
+}
+
+// 查询订单信息
+export function getOrderInfo(orderId) {
+  return request({
+    url: 'backendApi/order/info/' + orderId,
+    method: 'get'
+  })
+}
+
+// 更新订单状态
+export function updateOrderStatus(orderId, status) {
+  const data = {
+    orderId,
+    status
+  }
+  return request({
+      url: 'backendApi/order/updateStatus',
+      method: 'post',
+      data: data
+  })
+}
+
+// 删除订单
+export function deleteOrder(orderId) {
+  return request({
+    url: 'backendApi/order/delete/' + orderId,
+    method: 'get'
+  })
+}
+
+// 保存订单数据
+export function saveOrder(data) {
+  return request({
+    url: 'backendApi/order/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 验证核销订单
+export function verifyOrder(data) {
+  return request({
+    url: 'backendApi/order/verify',
+    method: 'post',
+    data: data
+  })
+}
+
+// 提交发货信息
+export function delivered(data) {
+  return request({
+    url: 'backendApi/order/delivered',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取配置信息
+export function getSettingInfo() {
+  return request({
+    url: 'backendApi/order/setting',
+    method: 'get'
+  })
+}
+
+// 保存配置
+export function saveSetting(data) {
+  return request({
+    url: 'backendApi/order/saveSetting',
+    method: 'post',
+    data: data
+  })
+}
--- a/fuintAdmin/src/api/order/cardvaluerecord.js
+++ b/fuintAdmin/src/api/order/cardvaluerecord.js
@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 查询挂账信息列表
+export function listCardValueRecord(cardValueRecord) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord',
+    method: 'get',
+    params: cardValueRecord
+  })
+}
+
+// 查询挂账信息列表
+export function listCardValueRecords(cardValueRecord) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord/list',
+    method: 'get',
+    params: cardValueRecord
+  })
+}
+// 查询挂账信息列表
+export function cardValueRecordInfo(id) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord/'+id,
+    method: 'get',
+  })
+}
+// 查询会员充值统计
+export function orderStatisticsApi(cardValueRecord) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord/orderStatistics',
+    method: 'get',
+    params: cardValueRecord
+  })
+}
--- a/fuintAdmin/src/api/order/cashierorder.js
+++ b/fuintAdmin/src/api/order/cashierorder.js
@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 查询收银台订单列表
+export function listCashierOrder(query) {
+  return request({
+    url: '/business/cashierOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询收银台订单列表
+export function cashierOrderSeekZeroAmount(query) {
+  return request({
+    url: '/business/cashierOrder/seekZeroAmount',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据id查询收银台订单列表
+export function cashierOrder(id) {
+  return request({
+    url: '/business/cashierOrder/'+id,
+    method: 'get',
+  })
+}
+
+// 根据订单号查询油品订单信息
+export function orderStatisticsApi(query) {
+  return request({
+    url: '/business/cashierOrder/orderStatistics',
+    method: 'get',
+    params: query
+  })
+}
--- a/fuintAdmin/src/api/order/data.js
+++ b/fuintAdmin/src/api/order/data.js
@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}
--- a/fuintAdmin/src/api/order/exportExcel.js
+++ b/fuintAdmin/src/api/order/exportExcel.js
@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 导出收银台订单
+export function exportExcelCashierApi(data) {
+  return request({
+    url: 'business/cashierOrder/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+
+// 导出油品订单
+export function exportExcelOilOrderApi(data) {
+  return request({
+    url: 'business/oilOrder/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    // params: data
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+
+// 导出商品订单
+export function exportExcelGoodsOrderApi(data) {
+  return request({
+    url: 'business/order/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+// 导出会员充值订单
+export function exportExcelVipApi(data) {
+  return request({
+    url: 'business/marketingActivity/cardValueRecord/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+// 导出小程序订单
+export function exportExcelAppletApi(data) {
+  return request({
+    url: 'business/cashierOrder/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+// 导出挂账订单
+export function exportExcelHangBillApi(data) {
+  return request({
+    url: 'business/hangBill/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
--- a/Show More
+++ b/Show More