Merge branch 'dev' into test

2023-11-21 18:35:57 +08:00
parent 9c95725969 f5aa29757e
commit 871988a9b3
32 changed files with 3537 additions and 6769 deletions
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-VITE_TITLE = '捷兑通 - 商家端'
+VITE_TITLE='捷兑通 - 商家端'

-VITE_PORT = 3100
+VITE_PORT=3100
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,13 @@
 # 资源公共路径,需要以 /开头和结尾
-VITE_PUBLIC_PATH = '/'
+VITE_PUBLIC_PATH='/'

 # 是否启用MOCK
-VITE_USE_MOCK = false
+VITE_USE_MOCK=false

 # 是否启用代理
-VITE_USE_PROXY = true
+VITE_USE_PROXY=true

 # base api
-VITE_BASE_API = '/store'
+VITE_BASE_API='/store'
+
+VITE_ADMIN_API='/admin'
--- a/.env.github
+++ b/.env.github
@@ -1,13 +0,0 @@
-# 自定义域名CNAME
-# VITE_CNAME = 'template.qszone.com'
-
-# 资源公共路径,需要以 /开头和结尾
-VITE_PUBLIC_PATH = '/vue-naive-admin/'
-
-VITE_USE_HASH = true
-
-# 是否启用MOCK
-VITE_USE_MOCK = true
-
-# base api
-VITE_BASE_API = '/api'
--- a/.env.production
+++ b/.env.production
@@ -1,14 +1,19 @@
 # 资源公共路径,需要以 /开头和结尾
-VITE_PUBLIC_PATH = '/static/mer'
+VITE_PUBLIC_PATH='/'

 # 是否启用MOCK
-VITE_USE_MOCK = false
+VITE_USE_MOCK=false

 # base api
-VITE_BASE_API = 'https://www.wanzhuanyongcheng.cn/store'
+VITE_BASE_API='//www.wanzhuanyongcheng.cn/store'
+
+VITE_ADMIN_API='//www.wanzhuanyongcheng.cn'

 # 是否启用压缩
-VITE_USE_COMPRESS = true
+VITE_USE_COMPRESS=true

 # 压缩类型
-VITE_COMPRESS_TYPE = gzip
+VITE_COMPRESS_TYPE=gzip
+
+# 是否启用监控
+VITE_SENTRY=true
--- a/.env.sentry-build-plugin
+++ b/.env.sentry-build-plugin
@@ -0,0 +1,5 @@
+# DO NOT commit this file to your repository!
+# The SENTRY_AUTH_TOKEN variable is picked up by the Sentry Build Plugin.
+# It's used for authentication when uploading source maps.
+# You can also set this env variable in your own `.env` files and remove this file.
+SENTRY_AUTH_TOKEN="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"
--- a/.env.test
+++ b/.env.test
@@ -1,7 +1,18 @@
-VITE_PUBLIC_PATH = '/static/mer'
-
-# 是否启用MOCK
-VITE_USE_MOCK = true
-
-# base api
-VITE_BASE_API = 'https://test.wanzhuanyongcheng.cn/store'
+VITE_PUBLIC_PATH='/'
+
+# 是否启用MOCK
+VITE_USE_MOCK=false
+
+# base api
+VITE_BASE_API='//test.wanzhuanyongcheng.cn/store'
+
+VITE_ADMIN_API='//test.wanzhuanyongcheng.cn'
+
+# 是否启用压缩
+VITE_USE_COMPRESS=true
+
+# 压缩类型
+VITE_COMPRESS_TYPE=gzip
+
+# 是否启用监控
+VITE_SENTRY=false
--- a/5
+++ b/5
@@ -0,0 +1,5 @@
+FROM nginx:alpine
+
+COPY dist/ /usr/share/nginx/html
+
+COPY default.conf /etc/nginx/conf.d/default.conf
--- a/build/constant.js
+++ b/build/constant.js
@@ -11,6 +11,11 @@ export const PROXY_CONFIG = {
    changeOrigin: true,
    // rewrite: (path) => path.replace(new RegExp('^/api'), ''),
  },
+  '/admin': {
+    target: 'https://test.wanzhuanyongcheng.cn',
+    changeOrigin: true,
+    // rewrite: (path) => path.replace(new RegExp('^/admin'), ''),
+  },
  /**
   * @desc    不替换匹配值
   * @请求路径  http://localhost:3100/api/v2/user
--- a/build/plugin/index.js
+++ b/build/plugin/index.js
@@ -14,6 +14,7 @@ import viteCompression from 'vite-plugin-compression'
 import { configHtmlPlugin } from './html'
 import { configMockPlugin } from './mock'
 import unplugin from './unplugin'
+import { sentryVitePlugin } from '@sentry/vite-plugin'

 export function createVitePlugins(viteEnv, isBuild) {
  const plugins = [vue(), ...unplugin, configHtmlPlugin(viteEnv, isBuild), Unocss()]
@@ -29,12 +30,27 @@ export function createVitePlugins(viteEnv, isBuild) {
  if (isBuild) {
    plugins.push(
      visualizer({
-        open: true,
+        open: false,
        gzipSize: true,
        brotliSize: true,
      })
    )
  }

+  if (viteEnv.VITE_SENTRY) {
+    plugins.push(
+      sentryVitePlugin({
+        authToken: process.env.SENTRY_AUTH_TOKEN,
+        org: 'sentry',
+        project: 'jdt-mer',
+        url: 'https://w.huakk.top',
+        sourcemaps: {
+          ignore: ['node_modules'],
+          filesToDeleteAfterUpload: ['dist/**/*.js.map'],
+        },
+      })
+    )
+  }
+
  return plugins
 }
--- a/build/plugin/unplugin.js
+++ b/build/plugin/unplugin.js
@@ -5,6 +5,7 @@ import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
 import { FileSystemIconLoader } from 'unplugin-icons/loaders'
 import IconsResolver from 'unplugin-icons/resolver'
 import mkcert from 'vite-plugin-mkcert'
+import { sentryVitePlugin } from '@sentry/vite-plugin'

 /**
 * * unplugin-icons插件，自动引入iconify图标
@@ -45,4 +46,11 @@ export default [
    customDomId: '__CUSTOM_SVG_ICON__',
  }),
  mkcert(),
+  sentryVitePlugin({
+    authToken:
+      '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',
+    org: 'sentry',
+    project: 'jdt-mer',
+    url: 'https://w.huakk.top',
+  }),
 ]
--- a/default.conf
+++ b/default.conf
@@ -0,0 +1,18 @@
+server {
+   # 监听ipv4
+   listen 80;
+   # 监听ipv6
+   listen [::]:80;
+   server_name localhost;
+
+   location / {
+      root /usr/share/nginx/html;
+      index index.html index.htm;
+      try_files $uri $uri/ /index.html;
+   }
+
+   error_page 500 502 503 504 /50x.html;
+   location = /50x.html {
+      root /usr/share/nginx/html;
+   }
+}
--- a/docs/使用unocss.md
+++ b/docs/使用unocss.md
@@ -1,3 +0,0 @@
-推荐阅读作者在掘金的文章：
-
-[保熟的 UnoCSS 使用指北，优雅使用 antfu 大佬的原子化 CSS](https://juejin.cn/post/7142466784971456548)
--- a/docs/使用图标.md
+++ b/docs/使用图标.md
@@ -1,40 +0,0 @@
-## 使用 iconify 图标
-
-首先去图标库地址：[icones](https://icones.js.org/) 找合适的图标
-
-### 1. 结合 unocss 使用
-
-```html
-<i i-carbon-sun />
-<i class="i-carbon-sun" />
-```
-
-### 2. 结合插件 unplugin-icons 自定义标签使用
-
-`<icon-[iconify图标名称]`
-
-```html
-<icon-ant-design:fullscreen-exit-outlined />
-<icon-ant-design:fullscreen-outlined />
-```
-
-这种方式还支持自定义 svg 图标，本项目自定义 svg 图标固定放在 src/assets/svg 下
-
-`<icon-custom-[svg图标文件名]`
-
-```
-<icon-custom-logo />
-```
-
-具体配置参看 build/plugin/unplugin.js
-
-### 3. 结合 Naive UI 的 NIcon 组件封装使用
-
-```html
-<!-- iconify图标 -->
-<TheIcon icon="material-symbols:delete-outline" />
-<!-- 自定义svg图标 -->
-<TheIcon icon="logo" type="custom" />
-```
-
-封装组件参看 src/components/icon
--- a/docs/安装pnpm.md
+++ b/docs/安装pnpm.md
@@ -1,34 +0,0 @@
-## 安装 pnpm
-
-### 使用 Corepack 安装（推荐）
-
-从 v16.13 开始，Node.js 发布了 Corepack 来管理包管理器。 这是一项实验性功能，需要通过运行如下脚本来启用它：
-
-```
-npx corepack enable // 可能需要管理员权限
-```
-
-这将自动在您的系统上安装 pnpm。 但是，它可能不是最新版本的 pnpm。 若要升级，请检查[最新的 pnpm 版本](https://github.com/pnpm/pnpm/releases/latest) 并运行，如 7.14.0
-
-```
-corepack prepare pnpm@7.14.0 --activate
-```
-
-如果是 Node.js v16.17 或者更新的版本，可以直接安装最新版本的 pnpm
-
-```
-corepack prepare pnpm@latest --activate
-```
-
-### 使用 npm 安装
-
-```
-npm i -g pnpm
-```
-
-更新，卸了重新装
-
-```
-npm uninstall -g pnpm
-npm i -g pnpm
-```
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,67 +0,0 @@
-upstream backend {
-    server 127.0.0.1:3000;
-    server 47.106.106.179:4000 backup;
-}
-
-server {
-    listen 80;
-    server_name www1.wanzhuanyongcheng.cn;
-    index index.php index.html index.htm default.php default.htm default.html;
-    root /www/wwwroot/www1.wanzhuanyongcheng.cn;
-
-    #PHP-INFO-START  PHP引用配置，可以注释或修改
-    include enable-php-00.conf;
-    #PHP-INFO-END
-
-    #REWRITE-START URL重写规则引用,修改后将导致面板设置的伪静态规则失效
-    include /www/server/panel/vhost/rewrite/www1.wanzhuanyongcheng.cn.conf;
-    #REWRITE-END
-
-    #禁止访问的文件或目录
-    location ~ ^/(\.user.ini|\.htaccess|\.git|\.env|\.svn|\.project|LICENSE|README.md) {
-        return 404;
-    }
-
-    #一键申请SSL证书验证目录相关设置
-    location ~ \.well-known {
-        allow all;
-    }
-
-    #禁止在证书验证目录放入敏感文件
-    if ( $uri ~ "^/\.well-known/.*\.(php|jsp|py|js|css|lua|ts|go|zip|tar\.gz|rar|7z|sql|bak)$" ) {
-        return 403;
-    }
-
-    location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$ {
-        expires 30d;
-        error_log /dev/null;
-        access_log /dev/null;
-    }
-
-    location ~ .*\.(js|css)?$ {
-        expires 12h;
-        error_log /dev/null;
-        access_log /dev/null;
-    }
-
-    location /api {
-        proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        error_page 502 = @switch_to_backup;
-    }
-
-    location @switch_to_backup {
-        proxy_pass http://47.106.106.179:4000;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        # Add any necessary additional configuration for backup container
-    }
-
-    access_log /www/wwwlogs/www1.wanzhuanyongcheng.cn.log;
-    error_log /www/wwwlogs/www1.wanzhuanyongcheng.cn.error.log;
-}
--- a/package.json
+++ b/package.json
@@ -3,7 +3,6 @@
  "version": "1.0.0",
  "scripts": {
    "build": "vite build",
-    "build:github": "vite build --mode github && esno ./build/script",
    "build:test": "vite build --mode test",
    "cz": "cz",
    "dev": "vite",
@@ -16,7 +15,8 @@
  },
  "lint-staged": {
    "*.{js,vue}": [
-      "eslint --ext .js,.vue ."
+      "eslint --ext .js,.vue .",
+      "npx prettier --write --end-of-line lf ."
    ]
  },
  "config": {
@@ -32,6 +32,8 @@
    ]
  },
  "dependencies": {
+    "@sentry/vite-plugin": "^2.10.1",
+    "@sentry/vue": "^7.80.1",
    "@unocss/eslint-config": "^0.55.7",
    "@vueuse/core": "^10.5.0",
    "@wangeditor/editor": "^5.1.23",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,6 +3,7 @@ import { setupRouterGuard } from './guard'
 import { basicRoutes, EMPTY_ROUTE, NOT_FOUND_ROUTE } from './routes'
 import { getToken, isNullOrWhitespace } from '@/utils'
 import { useUserStore, usePermissionStore } from '@/store'
+import * as Sentry from '@sentry/vue'

 const isHash = true
 export const router = createRouter({
@@ -14,6 +15,22 @@ export const router = createRouter({
 export async function setupRouter(app) {
  await addDynamicRoutes()
  setupRouterGuard(router)
+  if (import.meta.env.VITE_SENTRY) {
+    Sentry.init({
+      app,
+      dsn: 'https://aa4308fc56a9d107786b8dbcd2ae56e8@w.huakk.top/13',
+      integrations: [
+        new Sentry.BrowserTracing({
+          tracePropagationTargets: ['localhost', /^https:\/\/w\.huakk\.top\/api/],
+          routingInstrumentation: Sentry.vueRouterInstrumentation(router),
+        }),
+        new Sentry.Replay(),
+      ],
+      tracesSampleRate: 1.0,
+      replaysSessionSampleRate: 0.1,
+      replaysOnErrorSampleRate: 1.0,
+    })
+  }
  app.use(router)
 }

--- a/src/store/modules/user/index.js
+++ b/src/store/modules/user/index.js
@@ -29,10 +29,10 @@ export const useUserStore = defineStore('user', {
  },
  actions: {
    async getUserInfo() {
-      const typeMer = localStorage.getItem('type')
-      this.userInfo = {
-        role: [typeMer],
-      }
+      // const typeMer = localStorage.getItem('type')
+      // this.userInfo = {
+      //   role: [typeMer],
+      // }
      // try {
      //   const res = await api.getUser()
      //   const { id, name, avatar, role } = res.data
@@ -48,7 +48,7 @@ export const useUserStore = defineStore('user', {
      removeToken()
      resetTags()
      resetPermission()
-      resetRouter()
+      await resetRouter()
      this.$reset()
      toLogin()
    },
--- a/src/utils/http/interceptors.js
+++ b/src/utils/http/interceptors.js
@@ -2,6 +2,13 @@ import { getToken } from '@/utils'
 import { resolveResError } from './helpers'

 export function reqResolve(config) {
+  if (config.url.includes('/admin')) {
+    config.url = config.url.replace(new RegExp('^/admin'), '')
+    console.log(config)
+    config.baseURL = import.meta.env.VITE_ADMIN_API
+  } else {
+    config.baseURL = import.meta.env.VITE_BASE_API
+  }
  // 处理不需要token的请求
  if (config.noNeedToken) {
    return config
--- a/src/views/goods/add/index.vue
+++ b/src/views/goods/add/index.vue
@@ -1,12 +1,12 @@
 <template>
  <CommonPage show-footer :title="$route.title">
-    <!--{{ model }}-->
+    <!-- {{ model }} -->
    <n-spin size="large" :show="isShowSpin">
      <n-form ref="formRef" label-width="100" :model="model" :rules="rules" label-placement="left">
        <n-grid :cols="2" :x-gap="24">
          <n-form-item-gi :span="12" label="商品分类:" path="class_id">
            <n-select
-              v-model:value="model.class_id"
+              v-model:value="model.goods_class_id"
              label-field="name"
              value-field="ID"
              :options="classList"
@@ -22,14 +22,24 @@
          <n-form-item-gi :span="12" label="商品轮播图:" path="rotation">
            <Upload v-model:list="model.rotation" :max="5" multiple />
          </n-form-item-gi>
-          <n-form-item-gi :span="12" label="商品价格:" path="number">
-            <n-input-number v-model:value="model.number" placeholder="输入商品价格" />
+          <!--          <n-form-item-gi :span="12" label="支付方式:" path="pay_type">-->
+          <!--            <n-select-->
+          <!--              v-model:value="model.pay_type"-->
+          <!--              multiple-->
+          <!--              :options="[-->
+          <!--                { label: '微信支付', value: 1 },-->
+          <!--                { label: '积分支付', value: 2 },-->
+          <!--              ]"-->
+          <!--            />-->
+          <!--          </n-form-item-gi>-->
+          <n-form-item-gi :span="12" label="现金价格:" path="number">
+            <n-input-number v-model:value="model.number" :min="0" placeholder="输入现金价格" />
          </n-form-item-gi>
-          <n-form-item-gi :span="12" label="市场价格:" path="market_num">
-            <n-input-number v-model:value="model.market_num" placeholder="输入市场价格" />
+          <n-form-item-gi :span="12" label="积分价格:" path="exchange">
+            <n-input-number v-model:value="model.exchange" :min="0" placeholder="输入积分价格" />
          </n-form-item-gi>
          <n-form-item-gi :span="12" label="商品库存:" path="stock">
-            <n-input-number v-model:value="model.stock" placeholder="输入商品库存" />
+            <n-input-number v-model:value="model.stock" :min="0" placeholder="输入商品库存" />
          </n-form-item-gi>
          <n-form-item-gi :span="12" label="商品简介:" path="profile">
            <n-input v-model:value="model.profile" type="textarea" placeholder="输入商品简介" />
@@ -60,11 +70,12 @@ const formRef = ref(null)

 const model = ref({
  name: '',
-  class_id: null,
+  goods_class_id: null,
  cover: [],
  rotation: [],
  profile: '',
  details: '',
+  pay_type: [],
  stock: null,
  number: null,
  market_num: null,
@@ -77,7 +88,7 @@ const rules = {
    message: '请输入商品名称',
    trigger: 'blur',
  },
-  class_id: {
+  goods_class_id: {
    required: true,
    type: 'number',
    message: '请选择商品分类',
@@ -95,13 +106,19 @@ const rules = {
    message: '请上传商品轮播图',
    trigger: 'change',
  },
+  pay_type: {
+    required: true,
+    type: 'array',
+    message: '请选择支付方式',
+    trigger: 'change',
+  },
  number: {
    required: true,
    type: 'number',
    message: '请输入商品价格',
    trigger: 'blur',
  },
-  market_num: {
+  exchange: {
    required: true,
    type: 'number',
    message: '请输入市场价格',
--- a/src/views/goods/index/index.vue
+++ b/src/views/goods/index/index.vue
@@ -43,7 +43,7 @@ const columns = ref([
    align: 'center',
    slot: 'class_id',
    render(row) {
-      const data = optList.value.filter((item) => item.ID === row.class_id)
+      const data = optList.value.filter((item) => item.ID === row.goods_class_id)
      return h('span', data[0]?.name)
    },
  },
--- a/src/views/order/index1/index.vue
+++ b/src/views/order/index1/index.vue
@@ -84,7 +84,6 @@

 <script setup>
 import api from './api'
-import { NEllipsis } from 'naive-ui'

 const loading = ref(false)

@@ -142,27 +141,54 @@ const columns = ref([
  {
    title: '用户',
    align: 'center',
-    key: 'user_name',
+    slot: 'user',
+    render: (row) => {
+      return [
+        h(
+          'div',
+          {},
+          {
+            default: () => row.User.nickName,
+          }
+        ),
+      ]
+    },
  },
  {
-    title: '手机号',
+    title: '用户电话',
    align: 'center',
-    key: 'phone',
+    slot: 'phone',
+    render: (row) => {
+      return [
+        h(
+          'div',
+          {},
+          {
+            default: () => row.User.phone,
+          }
+        ),
+      ]
+    },
  },
  {
    title: '商品名称',
    align: 'center',
    slot: 'goods_name',
    render: (row) => {
-      return h(
-        NEllipsis,
-        {
-          style: 'max-width: 240px',
-        },
-        {
-          default: () => row.goods_name,
-        }
-      )
+      const el = []
+      row.OrderGoods.forEach((item) => {
+        el.push(
+          h(
+            'div',
+            {},
+            {
+              default: () =>
+                `${item.Goods.name}|${item.pay_price}元或${item.pay_integral}积分|X${item.number}`,
+            }
+          )
+        )
+      })
+      return el
    },
  },
  {
@@ -171,9 +197,22 @@ const columns = ref([
    key: 'count',
  },
  {
-    title: '商品总价',
+    title: '订单总价',
    align: 'center',
-    key: 'number',
+    slot: 'number',
+    render: (row) => h('span', row.pay_type === 1 ? `${row.price}元` : `${row.exchange}积分`),
+  },
+  {
+    title: '支付方式',
+    align: 'center',
+    slot: 'pay_type',
+    render: (row) => h('span', row.pay_type === 1 ? '微信' : '积分'),
+  },
+  {
+    title: '订单总价',
+    align: 'center',
+    slot: 'number',
+    render: (row) => h('span', row.pay_type === 1 ? `${row.price}元` : `${row.exchange}积分`),
  },
  {
    title: '订单状态',
@@ -184,9 +223,9 @@ const columns = ref([
        case 0:
          return h('span', '待付款')
        case 1:
-          return h('span', '待使用')
+          return h('span', '待核销')
        case 2:
-          return h('span', '已完成')
+          return h('span', '已核销')
        case 3:
          return h('span', '已过期')
      }
@@ -195,17 +234,17 @@ const columns = ref([
  {
    title: '赠送豆子',
    align: 'center',
-    key: 'pulse_number',
+    key: 'gift_pulse',
  },
  {
    title: '赠送积分',
    align: 'center',
-    key: 'integral',
+    key: 'gift_integral',
  },
  {
    title: '推广积分',
    align: 'center',
-    key: 'commission_number',
+    key: 'commission_integral',
  },
  {
    title: '分佣类型',
--- a/src/views/order/route.js
+++ b/src/views/order/route.js
@@ -4,7 +4,7 @@ export default {
  name: 'Order',
  path: '/order',
  component: Layout,
-  redirect: '/order_list',
+  redirect: 'gy_list',
  meta: {
    title: '订单管理',
    icon: 'majesticons:compass-line',
@@ -16,22 +16,22 @@ export default {
      path: 'gy_list',
      component: () => import('./index1/index.vue'),
      meta: {
-        requireAuth: true,
-        role: ['1'],
+        // requireAuth: true,
+        // role: ['1'],
        title: '订单列表',
        icon: 'material-symbols:auto-awesome-outline-rounded',
      },
    },
-    {
-      name: 'dhList',
-      path: 'dh_list',
-      component: () => import('./index/index.vue'),
-      meta: {
-        requireAuth: true,
-        title: '订单列表',
-        role: ['2'],
-        icon: 'material-symbols:auto-awesome-outline-rounded',
-      },
-    },
+    // {
+    //   name: 'dhList',
+    //   path: 'dh_list',
+    //   component: () => import('./index/index.vue'),
+    //   meta: {
+    //     requireAuth: true,
+    //     title: '订单列表',
+    //     role: ['2'],
+    //     icon: 'material-symbols:auto-awesome-outline-rounded',
+    //   },
+    // },
  ],
 }
--- a/src/views/settlement/route.js
+++ b/src/views/settlement/route.js
@@ -4,7 +4,7 @@ export default {
  name: '积分管理',
  path: '/settlement',
  component: Layout,
-  redirect: '/settlement_list',
+  redirect: 'jf_list',
  meta: {
    title: '积分管理',
    requireAuth: true,
--- a/src/views/sys/index/index.vue
+++ b/src/views/sys/index/index.vue
@@ -93,7 +93,6 @@ const days = ref([
 const getInfo = async () => {
  const res = await api.getMerchantInfo()
  infoData.value = res.data.data
-  console.log((!res.data.data.week_start && 1) || '00:00:00')
  model.value = {
    ...res.data.data,
    head_photo: [{ url: res.data.data.head_photo, status: 'finished', id: 1 }],
@@ -129,7 +128,7 @@ const submit = () => {
      delete data.lt
      const res = await api.updateMerchantInfo(data)
      $message.success(res.msg)
-      getInfo()
+      await getInfo()
    }
  })
 }
@@ -141,7 +140,6 @@ const submit = () => {
      <n-tab-pane name="1" tab="基本信息">
        <div>商户名称: {{ infoData.name }}</div>
        <div>负责人手机号码: {{ infoData.phone }}</div>
-        <div>商户类型: {{ infoData.bType === 1 ? '供应商' : '兑换商' }}</div>
        <!-- <div>经营类目: {{ infoData.scope }}</div> -->
        <div>入驻时间: {{ infoData.add_time }}</div>
      </n-tab-pane>
--- a/src/views/sys/route.js
+++ b/src/views/sys/route.js
@@ -4,7 +4,7 @@ export default {
  name: '商户设置',
  path: '/sys',
  component: Layout,
-  redirect: '/sys_info',
+  redirect: 'sys_info',
  meta: {
    title: '商户设置',
    icon: 'mdi:account-multiple',
--- a/src/views/user/index1/api.js
+++ b/src/views/user/index1/api.js
@@ -2,4 +2,14 @@ import { request } from '@/utils'

 export default {
  getUser: (data) => request.post('/user', data),
+  // 获取活动订单
+  gethdlist: (data) => request.post('/admin/user/order', data),
+  // 获取积分订单
+  getjflist: (data) => request.post('/admin/user/point/order', data),
+  // 获取豆子记录
+  getdzJllist: (data) => request.post('/admin/user/pluse', data),
+  // 获取积分记录
+  getjfJllist: (data) => request.post('/admin/user/point', data),
+  // 获取推广记录
+  gettgJllist: (data) => request.post('/admin/user/referee/point', data),
 }
--- a/src/views/user/index1/index.vue
+++ b/src/views/user/index1/index.vue
@@ -3,16 +3,21 @@
    <n-row gutter="12">
      <n-col :span="24">
        <div flex>
-          <n-card ml-10 w-200 rounded-5>
-            <n-statistic label="总积分" tabular-nums>
+          <!-- <n-card ml-10 w-200 rounded-5>
+            <n-statistic label="总积分(含赢)" tabular-nums>
              <n-number-animation :from="0" :to="cardData.integral" />
            </n-statistic>
-          </n-card>
+          </n-card> -->
          <n-card ml-10 w-200 rounded-5>
            <n-statistic label="总豆子" tabular-nums>
              <n-number-animation :from="0" :to="cardData.pulse" />
            </n-statistic>
          </n-card>
+          <n-card ml-10 w-200 rounded-5>
+            <n-statistic label="用户赢(积分)" tabular-nums>
+              <n-number-animation :from="0" :to="cardData.win" />
+            </n-statistic>
+          </n-card>
        </div>
      </n-col>
      <n-col :span="24" mt-10>
@@ -70,17 +75,106 @@
      remote
      @update:sorter="handleSorterChange"
    />
+
+    <!-- 用户详情 -->
+    <n-drawer v-model:show="isDrawer" :width="1000" placement="right" :mask-closable="false">
+      <n-drawer-content title="用户详情" closable>
+        <div flex items-center>
+          <img rounded-full :src="nowRow.avatarUrl" width="70" />
+          <div ml-10>
+            <div>昵称：{{ nowRow.nickName }}</div>
+            <div>电话：{{ nowRow.phone }}</div>
+          </div>
+        </div>
+        <div mt-10 w-200 flex items-center justify-between text-center>
+          <div>
+            <div>用户积分</div>
+            <div text-red>{{ nowRow.integral }}</div>
+          </div>
+          <div>
+            <div>用户豆子</div>
+            <div text-red>{{ nowRow.pulse }}</div>
+          </div>
+        </div>
+        <n-tabs v-model:value="tabVal" type="line" animated @update-value="tabsChange">
+          <n-tab name="1" tab="活动订单"></n-tab>
+          <n-tab name="2" tab="积分订单"></n-tab>
+          <n-tab name="3" tab="豆子记录"></n-tab>
+          <n-tab name="4" tab="积分记录"></n-tab>
+          <n-tab name="5" tab="推广记录"></n-tab>
+        </n-tabs>
+        <n-row gutter="12">
+          <n-col :span="12">
+            <div mt-10 flex items-center>
+              <span w-100>时间筛选：</span>
+              <n-date-picker
+                v-model:formatted-value="queryData.time"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetimerange"
+                clearable
+              />
+            </div>
+          </n-col>
+          <n-col v-if="tabVal === '4'" :span="10">
+            <div mt-10 flex items-center>
+              <span w-100>条件筛选：</span>
+              <n-select
+                v-model:value="queryData.selectKey"
+                :style="{ width: '30%' }"
+                :options="[
+                  {
+                    label: '取消订单',
+                    value: 1,
+                  },
+                  {
+                    label: '支付订单',
+                    value: 2,
+                  },
+                  {
+                    label: '商品赠送',
+                    value: 3,
+                  },
+                ]"
+                placeholder="请选择类型"
+              />
+            </div>
+          </n-col>
+          <n-col :span="4">
+            <div mt-10>
+              <n-button type="primary" @click="getTabsList">搜索</n-button>
+              <n-button ml-10 @click="tabsClear">重置</n-button>
+            </div>
+          </n-col>
+        </n-row>
+        <n-data-table
+          class="mt-5"
+          :columns="tabsColumns"
+          :loading="tabsLoading"
+          :data="tabsData"
+          :pagination="tabsPagination"
+          :bordered="false"
+          remote
+        />
+      </n-drawer-content>
+    </n-drawer>
  </CommonPage>
 </template>

 <script setup>
 import api from './api'
+import {
+  // NDropdown,
+  NButton,
+  NEllipsis,
+} from 'naive-ui'
+// import TheIcon from '@/components/icon/TheIcon.vue'

 const loading = ref(false)

 const cardData = ref({
  pulse: 0,
  integral: 0,
+  win: 0,
 })

 const queryData = ref({
@@ -97,11 +191,11 @@ const songs = ref([
  },
  {
    value: 3,
-    label: '用户输',
+    label: '用户赢',
  },
  {
    value: 4,
-    label: '用户赢',
+    label: '用户输',
  },
  {
    value: 5,
@@ -158,6 +252,13 @@ const columns = ref([
    sorter: true,
    sortOrder: false,
  },
+  {
+    title: '赢积分',
+    align: 'center',
+    key: 'win',
+    sorter: true,
+    sortOrder: false,
+  },
  {
    title: '用户豆子',
    align: 'center',
@@ -170,7 +271,44 @@ const columns = ref([
  //   align: 'center',
  //   slot: 'action',
  //   render(row) {
-  //     console.log(row)
+  //     return [
+  //       h(
+  //         NDropdown,
+  //         {
+  //           trigger: 'click',
+  //           options: [
+  //             {
+  //               label: '用户详情',
+  //               key: 1,
+  //             },
+  //           ],
+  //           onSelect: (key) => {
+  //             switch (key) {
+  //               case 1:
+  //                 openDrawer(row)
+  //                 break
+  //             }
+  //           },
+  //         },
+  //         {
+  //           default: () =>
+  //             h(
+  //               NButton,
+  //               {
+  //                 text: true,
+  //                 iconPlacement: 'right',
+  //               },
+  //               {
+  //                 default: () => '更多',
+  //                 icon: () =>
+  //                   h(TheIcon, {
+  //                     icon: 'ant-design:down-outlined',
+  //                   }),
+  //               }
+  //             ),
+  //         }
+  //       ),
+  //     ]
  //   },
  // },
 ])
@@ -221,6 +359,7 @@ const getList = async () => {
    pagination.value.itemCount = res.data.total
    cardData.value.integral = res.data.total_integral
    cardData.value.pulse = res.data.total_pulse
+    cardData.value.win = res.data.total_win
  } catch (error) {
    $message.error(error.msg)
  }
@@ -241,13 +380,6 @@ const handleSorterChange = (sorter) => {
  if (!loading.value) {
    loading.value = true
    switch (sorter.columnKey) {
-      case 'pulse':
-        columns.value[5].sortOrder = !sorter ? false : sorter.order
-        data.value = data.value.sort((a, b) => {
-          if (sorter.order === 'descend') return b.pulse - a.pulse
-          return a.pulse - b.pulse
-        })
-        break
      case 'integral':
        columns.value[4].sortOrder = !sorter ? false : sorter.order
        data.value = data.value.sort((a, b) => {
@@ -255,10 +387,244 @@ const handleSorterChange = (sorter) => {
          return a.integral - b.integral
        })
        break
+
+      case 'win':
+        columns.value[5].sortOrder = !sorter ? false : sorter.order
+        data.value = data.value.sort((a, b) => {
+          if (sorter.order === 'descend') return b.win - a.win
+          return a.win - b.win
+        })
+        break
+      case 'pulse':
+        columns.value[6].sortOrder = !sorter ? false : sorter.order
+        data.value = data.value.sort((a, b) => {
+          if (sorter.order === 'descend') return b.pulse - a.pulse
+          return a.pulse - b.pulse
+        })
+        break
    }
    loading.value = false
  }
 }
+
+const isDrawer = ref(false)
+
+const nowRow = ref({})
+
+const tabVal = ref('1')
+
+const tabsLoading = ref(false)
+const tabsColumns = ref([])
+const tabsData = ref([])
+const tabsPagination = ref({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  onChange: (page) => {
+    tabsPagination.value.page = page
+    getTabsList()
+  },
+})
+
+// eslint-disable-next-line no-unused-vars
+const openDrawer = (row) => {
+  nowRow.value = row
+  isDrawer.value = true
+  // getTabsList()
+  tabsChange()
+}
+
+const tabsChange = async (e = '1') => {
+  tabVal.value = e
+  tabsData.value = []
+  tabsColumns.value = []
+  if (tabVal.value === '1' || tabVal.value === '2') {
+    tabsColumns.value = [
+      {
+        title: '订单号',
+        align: 'center',
+        key: 'oid',
+      },
+      {
+        title: '商品封面',
+        align: 'center',
+        slot: 'cover',
+        render: (row) => {
+          return h('img', {
+            src: row.cover,
+            style: {
+              width: '50px',
+              height: '50px',
+            },
+          })
+        },
+      },
+      {
+        title: '商品名称',
+        align: 'center',
+        slot: 'goods_name',
+        render: (row) => {
+          return h(
+            NEllipsis,
+            {
+              style: 'max-width: 240px',
+            },
+            {
+              default: () => row.goods_name,
+            }
+          )
+        },
+      },
+      {
+        title: '商品价格',
+        align: 'center',
+        key: 'number',
+      },
+      {
+        title: '订单状态',
+        align: 'center',
+        slot: 'status',
+        render: (row) => {
+          let nameStr = ''
+          switch (row.status) {
+            case 0:
+              nameStr = '待付款'
+              break
+            case 1:
+              nameStr = '待使用'
+              break
+            case 2:
+              nameStr = '已使用'
+              break
+            case 3:
+              nameStr = '已过期'
+          }
+          return h(
+            'span',
+            {},
+            {
+              default: () => nameStr,
+            }
+          )
+        },
+      },
+      {
+        title: '下单时间',
+        align: 'center',
+        key: 'add_time',
+      },
+    ]
+  } else if (tabVal.value === '3') {
+    tabsColumns.value = [
+      {
+        title: '订单号',
+        align: 'center',
+        key: 'oid',
+      },
+      {
+        title: '商品名称',
+        align: 'center',
+        key: 'goods_name',
+      },
+      {
+        title: '消费金额',
+        align: 'center',
+        key: 'number',
+      },
+      {
+        title: '下单时间',
+        align: 'center',
+        key: 'add_time',
+      },
+    ]
+  } else if (tabVal.value === '4') {
+    tabsColumns.value = [
+      {
+        title: '订单号',
+        align: 'center',
+        key: 'oid',
+      },
+      {
+        title: '商品名称',
+        align: 'center',
+        key: 'goods_name',
+      },
+      {
+        title: '积分',
+        align: 'center',
+        key: 'number',
+      },
+      {
+        title: '时间',
+        align: 'center',
+        key: 'add_time',
+      },
+    ]
+  } else {
+    tabsColumns.value = [
+      {
+        title: '订单号',
+        align: 'center',
+        key: 'oid',
+      },
+      {
+        title: '用户昵称',
+        align: 'center',
+        key: 'nick_name',
+      },
+      {
+        title: '商品名称',
+        align: 'center',
+        key: 'goods_name',
+      },
+      {
+        title: '获得积分',
+        align: 'center',
+        key: 'number',
+      },
+      {
+        title: '时间',
+        align: 'center',
+        key: 'add_time',
+      },
+    ]
+  }
+  tabsPagination.value.page = 1
+  getTabsList()
+}
+
+const getTabsList = async () => {
+  tabsLoading.value = true
+  let res
+  const data = {
+    uid: nowRow.value.uid,
+    pageNum: tabsPagination.value.page,
+    pageSize: tabsPagination.value.pageSize,
+    StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
+    EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
+  }
+  switch (tabVal.value) {
+    case '1':
+      res = await api.gethdlist(data)
+      break
+    case '2':
+      res = await api.getjflist(data)
+      break
+    case '3':
+      res = await api.getdzJllist(data)
+      break
+    case '4':
+      data['Type'] = queryData.value.selectKey
+      res = await api.getjfJllist(data)
+      break
+    case '5':
+      res = await api.gettgJllist(data)
+      break
+  }
+  tabsData.value = res.data.data || []
+  tabsPagination.value.itemCount = res.data.total
+  tabsLoading.value = false
+}
 </script>

 <style lang="scss" scoped></style>
--- a/src/views/user/route.js
+++ b/src/views/user/route.js
@@ -4,32 +4,32 @@ export default {
  name: '用户管理',
  path: '/user',
  component: Layout,
-  redirect: '/user_list',
+  redirect: 'dh_user_list',
  meta: {
    title: '用户管理',
    icon: 'mdi:account-multiple',
    order: 10,
  },
  children: [
-    {
-      name: 'dhUserlist',
-      path: 'dh_user_list',
-      component: () => import('./index/index.vue'),
-      meta: {
-        requireAuth: true,
-        role: ['2'],
-        title: '用户列表',
-        icon: 'mdi:account-multiple',
-        order: 10,
-      },
-    },
+    // {
+    //   name: 'dhUserlist',
+    //   path: 'dh_user_list',
+    //   component: () => import('./index/index.vue'),
+    //   meta: {
+    //     // requireAuth: true,
+    //     // role: ['2'],
+    //     title: '用户列表',
+    //     icon: 'mdi:account-multiple',
+    //     order: 10,
+    //   },
+    // },
    {
      name: 'gyUserlist',
      path: 'gy_user_list',
      component: () => import('./index1/index.vue'),
      meta: {
-        requireAuth: true,
-        role: ['1'],
+        // requireAuth: true,
+        // role: ['1'],
        title: '用户列表',
        icon: 'mdi:account-multiple',
        order: 10,
--- a/vercel.json
+++ b/vercel.json
@@ -1,8 +0,0 @@
-{
-  "rewrites": [
-    {
-      "source": "/(.*)",
-      "destination": "/index.html"
-    }
-  ]
-}
--- a/vite.config.js
+++ b/vite.config.js
@@ -11,7 +11,7 @@ export default defineConfig(({ command, mode }) => {

  const env = loadEnv(mode, process.cwd())
  const viteEnv = convertEnv(env)
-  const { VITE_PORT, VITE_PUBLIC_PATH, VITE_USE_PROXY, VITE_BASE_API } = viteEnv
+  const { VITE_PORT, VITE_PUBLIC_PATH, VITE_USE_PROXY, VITE_BASE_API, VITE_ADMIN_API } = viteEnv

  return {
    base: VITE_PUBLIC_PATH || '/',
@@ -30,7 +30,7 @@ export default defineConfig(({ command, mode }) => {
      proxy: VITE_USE_PROXY
        ? {
            [VITE_BASE_API]: PROXY_CONFIG[VITE_BASE_API],
-            '/api/v2': PROXY_CONFIG['/api/v2'],
+            [VITE_ADMIN_API]: PROXY_CONFIG[VITE_ADMIN_API],
          }
        : undefined,
    },
@@ -39,6 +39,7 @@ export default defineConfig(({ command, mode }) => {
      outDir: OUTPUT_DIR || 'dist',
      reportCompressedSize: false, // 启用/禁用 gzip 压缩大小报告
      chunkSizeWarningLimit: 1024, // chunk 大小警告的限制（单位kb）
+      sourcemap: true,
    },
  }
 })