fix(other): bug修复

fix(components): 修复搜索页样式错乱
feat(projects): 首页主备优化
2026-01-10 21:30:50 +08:00 · 2025-12-03 01:17:06 +08:00 · 2025-12-02 23:57:04 +08:00 · 2025-11-05 11:56:16 +08:00 · 2025-11-05 11:32:38 +08:00 · 2025-10-31 19:15:29 +08:00
119 changed files with 3054 additions and 1623 deletions
--- a/.cursorignore
+++ b/.cursorignore
@@ -0,0 +1,8 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+
+/dist
+/node_modules
+/pnpm-store
+/dist.tar
+/dist.tar.gz
+/dist.tar.gz.part
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,64 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: 测试服-依赖安装&&编译打包&&上传微信小程序平台
-    pull: if-not-exists
-    image: node:20-alpine
-    when:
-      branch:
-        - test
-    commands:
-      - npm config set registry https://registry.npmmirror.com/
-      - npm install -g pnpm
-      - pnpm install
-      - pnpm build:weapp:test:upload
-      - rm -rf dist.tar
-      - rm -rf node_modules
-
-  - name: 正式服-依赖安装&&编译打包&&上传微信小程序平台
-    pull: if-not-exists
-    image: node:20-alpine
-    when:
-      branch:
-        - master
-    commands:
-      - npm config set registry https://registry.npmmirror.com/
-      - npm install -g pnpm
-      - pnpm install
-      - pnpm build:weapp:prod:upload
-      - rm -rf dist.tar
-      - rm -rf node_modules
-
-  - name: 企业微信通知
-    pull: if-not-exists
-    image: plugins/webhook
-    when:
-      branch:
-        - test
-        - master
-      status:
-        - success
-        - failure
-    settings:
-      urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5
-      content_type: application/json
-      template: |
-        {
-          "msgtype": "markdown",
-          "markdown": {
-              "content": "{{#success build.status}}✅{{else}}❌{{/success}}**{{ repo.owner }}/{{ repo.name }}** (Build #{{build.number}})\n
-                          >**构建结果**: {{ build.status }}
-                          >**构建详情**: [点击查看]({{ build.link }})
-                          >**代码分支**: {{ build.branch }}
-                          >**提交标识**: {{ build.commit }}
-                          >**提交发起**: {{ build.author }}
-                          >**提交信息**: {{ build.message }}
-        "
-          }
-        }
--- a/.env.development
+++ b/.env.development
@@ -2,14 +2,17 @@
 TARO_APP_ID='wx7b3322daa2cf9c88'

 # 开发版appkey
-TARO_APP_KEY='1234567890'
+TARO_APP_KEY=''

 # API接口
 TARO_APP_API='https://test.wanzhuanyongcheng.cn/app'

-# 骰子游戏链接
-TARO_APP_GAME='https://jdt-test-tz.wanzhuanyongcheng.cn/pages/index/index?uid='
-# TARO_APP_GAME='http://192.168.31.225:10086?uid='

-# 捕鱼游戏链接
-TARO_APP_FISH_GAME='https://jdt-test-fish.wanzhuanyongcheng.cn/?uid='
+# 版权文字
+TARO_APP_NAME='捷兑通'
+TARO_APP_COP='玩赚商城版权所有'
+
+TARO_APP_TITLE_IMG='../../../static/index/1.png'
+TARO_APP_LOGO_IMG='../../../static/logo.jpg'
+
+TARO_APP_SHOW_NEW_HOME='no'
--- a/.env.production
+++ b/.env.production
@@ -1,13 +1,19 @@
-# 正式版版appid
+# 正式版appid
 TARO_APP_ID='wxdd00d46fa6f07974'

-# 开发版appkey
+# 正式版appkey
 TARO_APP_KEY='private.wxdd00d46fa6f07974.key'

 # API接口
 TARO_APP_API='https://www.wanzhuanyongcheng.cn/app'

-TARO_APP_GAME='https://jdt-prod-tz.wanzhuanyongcheng.cn/pages/index/index?uid='

-# 捕鱼游戏链接
-TARO_APP_FISH_GAME='https://jdt-prod-fish.wanzhuanyongcheng.cn/?uid='
+# 版权文字
+TARO_APP_NAME='捷兑通'
+TARO_APP_COP='鑫瓴科技版权所有'
+
+TARO_APP_TITLE_IMG='../../../static/index/1.png'
+TARO_APP_LOGO_IMG='../../../static/logo.jpg'
+
+
+TARO_APP_SHOW_NEW_HOME='no'
--- a/.env.reserve
+++ b/.env.reserve
@@ -0,0 +1,18 @@
+# 备用版appid
+TARO_APP_ID='wx4a9380d8bb16d9de'
+
+# 备用版appkey
+TARO_APP_KEY='private.wx4a9380d8bb16d9de.key'
+
+# API接口
+TARO_APP_API='https://api.gxwzwh.com/app'
+
+# 版权文字
+TARO_APP_NAME='玩赚商城'
+
+TARO_APP_COP='玩赚商城版权所有'
+
+TARO_APP_TITLE_IMG='../../../static/index/title.png'
+TARO_APP_LOGO_IMG='../../../static/logo-1.jpg'
+
+TARO_APP_SHOW_NEW_HOME='yes'
--- a/.env.test
+++ b/.env.test
@@ -7,8 +7,12 @@ TARO_APP_KEY='private.wx7b3322daa2cf9c88.key'
 # API接口
 TARO_APP_API='https://test.wanzhuanyongcheng.cn/app'

-# 游戏链接
-TARO_APP_GAME='https://jdt-test-tz.wanzhuanyongcheng.cn/pages/index/index?uid='

-# 捕鱼游戏链接
-TARO_APP_FISH_GAME='https://jdt-test-fish.wanzhuanyongcheng.cn/?uid='
+# 版权文字
+TARO_APP_NAME='捷兑通'
+TARO_APP_COP='鑫瓴科技版权所有'
+
+TARO_APP_TITLE_IMG='../../static/index/1.png'
+TARO_APP_LOGO_IMG='../../../static/logo.jpg'
+
+TARO_APP_SHOW_NEW_HOME='no'
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1,4 @@
+/node_modules/**
+/dist/*
+/public/*
+/src/static/*
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -0,0 +1,126 @@
+name: CI Build & Upload (WeApp)
+
+on:
+  push:
+    branches:
+      - test
+      - master
+
+jobs:
+  build-upload-dev:
+    if: ${{ gitea.ref == 'refs/heads/test' }}
+    runs-on: gitea_act_runner
+    container:
+      image: node:24-alpine
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install deps
+        run: |
+          npm install -g pnpm
+          pnpm config set registry https://registry.npmmirror.com/
+          pnpm install
+
+      - name: Build & Upload (test)
+        run: |
+          pnpm build:weapp:test:upload
+          rm -rf dist.tar || true
+
+      - name: Notify WeCom (Dev)
+        if: always()
+        env:
+          WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
+          STATUS: ${{ job.status }}
+          REPO: ${{ gitea.repository }}
+          RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
+          BRANCH: ${{ gitea.ref_name }}
+          COMMIT: ${{ gitea.sha }}
+          ACTOR: ${{ gitea.actor }}
+          COMMIT_MSG: ${{ gitea.event.head_commit.message }}
+        run: |
+          sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk add --no-cache curl jq
+          EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" )
+          MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \
+            "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")"
+          JSON=$(jq -n --arg content "$MSG" '{msgtype:"markdown", markdown:{content:$content}}')
+          curl -sS -H 'Content-Type: application/json' -d "$JSON" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
+
+  build-upload-prod:
+    if: ${{ gitea.ref == 'refs/heads/master' }}
+    runs-on: gitea_act_runner
+    container:
+      image: node:24-alpine
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install deps
+        run: |
+          npm install -g pnpm
+          pnpm config set registry https://registry.npmmirror.com/
+          pnpm install
+
+      - name: Build & Upload (prod)
+        run: |
+          pnpm build:weapp:prod:upload
+          rm -rf dist.tar || true
+
+      - name: Notify WeCom (Prod)
+        if: always()
+        env:
+          WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
+          STATUS: ${{ job.status }}
+          REPO: ${{ gitea.repository }}
+          RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
+          BRANCH: ${{ gitea.ref_name }}
+          COMMIT: ${{ gitea.sha }}
+          ACTOR: ${{ gitea.actor }}
+          COMMIT_MSG: ${{ gitea.event.head_commit.message }}
+        run: |
+          sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk add --no-cache curl jq
+          EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" )
+          MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \
+            "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")"
+          JSON=$(jq -n --arg content "$MSG" '{msgtype:"markdown", markdown:{content:$content}}')
+          curl -sS -H 'Content-Type: application/json' -d "$JSON" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
+
+  build-upload-reserve:
+    if: ${{ gitea.ref == 'refs/heads/master' }}
+    runs-on: gitea_act_runner
+    container:
+      image: node:24-alpine
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install deps
+        run: |
+          npm install -g pnpm
+          pnpm config set registry https://registry.npmmirror.com/
+          pnpm install
+
+      - name: Build & Upload (reserve)
+        run: |
+          pnpm build:weapp:reserve:upload
+          rm -rf dist.tar || true
+
+      - name: Notify WeCom (Reserve)
+        if: always()
+        env:
+          WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
+          STATUS: ${{ job.status }}
+          REPO: ${{ gitea.repository }}
+          RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
+          BRANCH: ${{ gitea.ref_name }}
+          COMMIT: ${{ gitea.sha }}
+          ACTOR: ${{ gitea.actor }}
+          COMMIT_MSG: ${{ gitea.event.head_commit.message }}
+        run: |
+          sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
+          apk add --no-cache curl jq
+          EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" )
+          MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \
+            "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")"
+          JSON=$(jq -n --arg content "$MSG" '{msgtype:"markdown", markdown:{content:$content}}')
+          curl -sS -H 'Content-Type: application/json' -d "$JSON" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,57 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/.idea/git_toolbox_blame.xml
+++ b/.idea/git_toolbox_blame.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitToolBoxBlameSettings">
-    <option name="version" value="2" />
-  </component>
-</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
-  </profile>
-</component>
--- a/.idea/jdt-user.iml
+++ b/.idea/jdt-user.iml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jdt-user.iml" filepath="$PROJECT_DIR$/.idea/jdt-user.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
-</project>
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,4 @@
 /node_modules/**
 /dist/*
 /public/*
+/src/static/*
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,7 +1,8 @@
 {
  "arrowParens": "avoid",
  "bracketSameLine": true,
-  "bracketSpacing": false,
+  "bracketSpacing": true,
  "singleQuote": true,
-  "trailingComma": "all"
+  "trailingComma": "all",
+  "endOfLine": "lf"
 }
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,3 @@
-// babel-preset-taro 更多选项和默认值：
-// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
 module.exports = {
  presets: [
    [
--- a/components.d.ts
+++ b/components.d.ts
@@ -1,11 +1,12 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
+// biome-ignore lint: disable
 export {}

-declare module '@vue/runtime-core' {
+/* prettier-ignore */
+declare module 'vue' {
  export interface GlobalComponents {
    Auth: typeof import('./src/components/Auth.vue')['default']
    Back: typeof import('./src/components/Back.vue')['default']
@@ -29,7 +30,6 @@ declare module '@vue/runtime-core' {
    NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
    NutInput: typeof import('@nutui/nutui-taro')['Input']
    NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
-    NutNumberKeyboard: typeof import('@nutui/nutui-taro')['NumberKeyboard']
    NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
    NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
    NutPicker: typeof import('@nutui/nutui-taro')['Picker']
@@ -39,7 +39,6 @@ declare module '@vue/runtime-core' {
    NutRadio: typeof import('@nutui/nutui-taro')['Radio']
    NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup']
    NutRate: typeof import('@nutui/nutui-taro')['Rate']
-    NutShortPassword: typeof import('@nutui/nutui-taro')['ShortPassword']
    NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
    NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
    NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
--- a/config/dev.ts
+++ b/config/dev.ts
@@ -4,7 +4,6 @@ module.exports = {
  env: {
    NODE_ENV: '"development"',
  },
-  defineConstants: {},
  mini: {},
  h5: {},
 };
--- a/config/index.ts
+++ b/config/index.ts
@@ -1,24 +1,24 @@
-// @ts-nocheck
 import Components from 'unplugin-vue-components/webpack';
 import NutUIResolver from '@nutui/nutui-taro/dist/resolver';
 import { UnifiedWebpackPluginV5 } from 'weapp-tailwindcss/webpack';
 import { join } from 'node:path';
 import { argv } from 'yargs';

-const {robot = 1, desc} = argv;
-
 const CIPluginOptFn = async () => {
  /**
   * @typedef { import('@tarojs/plugin-mini-ci').CIOptions } CIOptions
   * @type {CIOptions}
   */
+
+  const parsedArgs = await argv;
+
  return {
    weapp: {
      appid: process.env.TARO_APP_ID,
      privateKeyPath: process.env.TARO_APP_KEY,
-      robot,
+      robot: parsedArgs.robot || 1,
    },
-    desc,
+    desc: parsedArgs.desc,
  };
 };

@@ -38,7 +38,7 @@ const config = {
    375: 2,
  },
  sourceRoot: 'src',
-  outputRoot: 'dist',
+  outputRoot: `dist/${process.env.TARO_ENV}`,
  plugins: ['@tarojs/plugin-html', ['@tarojs/plugin-mini-ci', CIPluginOptFn]],
  defineConstants: {},
  copy: {
@@ -48,13 +48,14 @@ const config = {
  framework: 'vue3',
  compiler: {
    type: 'webpack5',
-    prebundle: {enable: false},
+    prebundle: { enable: process.env.TARO_ENV === 'h5' },
  },
  cache: {
    enable: false, // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
  },
  sass: {
    data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`,
+    silenceDeprecations: ['import'],
  },
  alias: {
    '@': join(__dirname, '..', 'src'),
--- a/config/prod.ts
+++ b/config/prod.ts
@@ -4,7 +4,6 @@ module.exports = {
  env: {
    NODE_ENV: '"production"',
  },
-  defineConstants: {},
  mini: {},
  h5: {
    /**
--- a/package.json
+++ b/package.json
@@ -1,19 +1,12 @@
 {
  "name": "jdt-user",
-  "version": "4.0.4",
-  "private": true,
-  "description": "",
-  "templateInfo": {
-    "name": "jdt-user",
-    "typescript": true,
-    "css": "sass"
-  },
+  "version": "4.0.18",
  "taroConfig": {
-    "version": "4.0.4"
+    "version": "4.0.18"
  },
  "scripts": {
    "build:weapp": "taro build --type weapp",
-    "build:test": "taro build --type weapp --mode test",
+    "build:test": "taro build --type weapp --mode reserve",
    "build:swan": "taro build --type swan",
    "build:alipay": "taro build --type alipay",
    "build:tt": "taro build --type tt",
@@ -23,6 +16,7 @@
    "build:jd": "taro build --type jd",
    "build:quickapp": "taro build --type quickapp",
    "dev:weapp": "taro build --type weapp --watch",
+    "dev:weapp:prview": "taro build --type weapp --watch --mode reserve",
    "dev:swan": "npm run build:swan -- --watch",
    "dev:alipay": "npm run build:alipay -- --watch",
    "dev:tt": "npm run build:tt -- --watch",
@@ -35,11 +29,10 @@
    "lint:fix": "eslint --fix --ext .ts,.vue .",
    "lint:staged": "lint-staged",
    "prepare": "husky install",
-    "preview": "vite preview",
    "cz": "cz",
-    "lf": "npx prettier --write --end-of-line lf .",
    "postinstall": "weapp-tw patch",
    "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'",
+    "build:weapp:reserve:upload": "taro build --type weapp --upload --robot=3 --desc='备用环境' --mode reserve",
    "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test"
  },
  "browserslist": [
@@ -47,11 +40,10 @@
    "Android >= 4.1",
    "ios >= 8"
  ],
-  "author": "",
+  "author": "JDT",
  "lint-staged": {
    "*.{ts,vue}": [
-      "eslint --ext .ts,.vue .",
-      "npx prettier --write --end-of-line lf ."
+      "eslint --ext .ts,.vue ."
    ]
  },
  "config": {
@@ -60,66 +52,68 @@
    }
  },
  "dependencies": {
-    "@babel/runtime": "^7.23.5",
+    "@babel/runtime": "^7.28.4",
    "@nutui/icons-vue-taro": "^0.0.9",
-    "@nutui/nutui-taro": "^4.3.12",
+    "@nutui/nutui-taro": "^4.3.14",
    "@qiun/vue-ucharts": "2.5.0-20230101",
-    "@tarojs/components": "3.6.34",
-    "@tarojs/helper": "3.6.34",
-    "@tarojs/plugin-framework-vue3": "3.6.34",
-    "@tarojs/plugin-html": "3.6.34",
-    "@tarojs/plugin-platform-alipay": "3.6.34",
-    "@tarojs/plugin-platform-h5": "3.6.34",
-    "@tarojs/plugin-platform-jd": "3.6.34",
-    "@tarojs/plugin-platform-qq": "3.6.34",
-    "@tarojs/plugin-platform-swan": "3.6.34",
-    "@tarojs/plugin-platform-tt": "3.6.34",
-    "@tarojs/plugin-platform-weapp": "3.6.34",
-    "@tarojs/runtime": "3.6.34",
-    "@tarojs/shared": "3.6.34",
-    "@tarojs/taro": "3.6.34",
-    "dayjs": "^1.11.10",
-    "pinia": "^2.1.7",
+    "@tarojs/components": "4.1.6",
+    "@tarojs/helper": "4.1.6",
+    "@tarojs/plugin-framework-vue3": "4.1.6",
+    "@tarojs/plugin-html": "4.1.6",
+    "@tarojs/plugin-platform-alipay": "4.1.6",
+    "@tarojs/plugin-platform-h5": "4.1.6",
+    "@tarojs/plugin-platform-jd": "4.1.6",
+    "@tarojs/plugin-platform-qq": "4.1.6",
+    "@tarojs/plugin-platform-swan": "4.1.6",
+    "@tarojs/plugin-platform-tt": "4.1.6",
+    "@tarojs/plugin-platform-weapp": "4.1.6",
+    "@tarojs/runtime": "4.1.6",
+    "@tarojs/shared": "4.1.6",
+    "@tarojs/taro": "4.1.6",
+    "dayjs": "^1.11.18",
+    "pinia": "^2.3.1",
    "uqrcodejs": "^4.0.7",
-    "vue": "^3.3.9"
+    "vue": "^3.5.21"
  },
  "devDependencies": {
-    "@babel/core": "^7.23.5",
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@tarojs/cli": "3.6.34",
-    "@tarojs/plugin-mini-ci": "3.6.34",
-    "@tarojs/taro-loader": "3.6.34",
-    "@tarojs/webpack5-runner": "3.6.34",
-    "@types/node": "^18.19.1",
-    "@types/webpack-env": "^1.18.4",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
-    "@unocss/webpack": "^0.60.0",
-    "@vue/babel-plugin-jsx": "^1.1.5",
-    "@vue/compiler-sfc": "^3.3.9",
-    "autoprefixer": "^10.4.19",
-    "babel-preset-taro": "3.6.34",
-    "commitizen": "^4.3.0",
+    "@babel/core": "^7.28.4",
+    "@commitlint/cli": "^18.6.1",
+    "@commitlint/config-conventional": "^18.6.3",
+    "@tarojs/cli": "4.1.6",
+    "@tarojs/plugin-mini-ci": "4.1.6",
+    "@tarojs/taro-loader": "4.1.6",
+    "@tarojs/webpack5-runner": "4.1.6",
+    "@types/node": "^18.19.124",
+    "@types/webpack-env": "^1.18.8",
+    "@types/yargs": "^17.0.33",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@unocss/webpack": "^0.60.4",
+    "@vue/babel-plugin-jsx": "^1.5.0",
+    "@vue/compiler-sfc": "^3.5.21",
+    "autoprefixer": "^10.4.21",
+    "babel-preset-taro": "4.1.6",
+    "commitizen": "^4.3.1",
    "css-loader": "3.4.2",
-    "cz-customizable": "^7.0.0",
-    "eslint": "^8.55.0",
-    "eslint-config-taro": "3.6.34",
-    "eslint-plugin-vue": "^9.19.2",
+    "cz-customizable": "^7.5.1",
+    "eslint": "^8.57.1",
+    "eslint-config-taro": "4.1.6",
+    "eslint-plugin-vue": "^9.33.0",
    "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
-    "miniprogram-ci": "^2.0.8",
+    "lint-staged": "^15.5.2",
+    "miniprogram-ci": "^2.1.26",
    "postcss": "8.4.29",
-    "postcss-rem-to-responsive-pixel": "^6.0.1",
+    "postcss-rem-to-responsive-pixel": "^6.1.0",
+    "prettier": "^3.6.2",
    "style-loader": "1.3.0",
    "stylelint": "9.3.0",
-    "tailwindcss": "^3.4.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
-    "unplugin-vue-components": "^0.23.0",
-    "vue-loader": "^17.3.1",
-    "weapp-tailwindcss": "^3.2.0",
-    "webpack": "^5.89.0"
-  },
-  "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0"
+    "tailwindcss": "^3.4.17",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.2",
+    "unplugin-vue-components": "^28.8.0",
+    "vue-loader": "^17.4.2",
+    "weapp-tailwindcss": "^3.7.0",
+    "webpack": "^5.101.3",
+    "yargs": "^17.7.2"
+  }
 }
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,13 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'
+  - '@swc/core'
+  - '@tarojs/binding'
+  - '@tarojs/cli'
+  - core-js
+  - core-js-pure
+  - esbuild
+  - less
+  - protobufjs
+  - swiper
+  - vue-demi
+  - weapp-tailwindcss
--- a/private.wx4a9380d8bb16d9de.key
+++ b/private.wx4a9380d8bb16d9de.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAmHk5BywZ6y2rji/dL2HooKGiTuHrcSeGFODvDK6PPUjnieWB
+ev7C6N9kBWNbtYiwyLVpW5iKCxCb/GaBa5EIE0nXnKiOhThP3a8OYDW0oA9Xyp03
+1W56U3tnHA/GziyABIIMxqA45WYh3e9ar/sdhDvDyre0yl+8cWcPdNOVOW7as88W
+yXDsCQbQedPIAy3sRANZ6K2QTNe5Aht3Y7F1uMKRlJwLodutUopPd32rxJz7WNhB
+j9CrjzgnfLJa7siURM2r6om2osNFqHP4bmy5yO68TPI8JQgJTUqoNswgFDa2ng9Y
+lOhks6kMR8ldL89+fYqILGDVG7124LKIo1awTQIDAQABAoIBACS+Kaj5zrEmy02z
+aRjO/lEfQk7CEIuvG5eScOjcc/YvyGQpo18xX2Tg2GiX/fSsIPXtCZuiEboC4aQc
+S5nRVGHZjJTa5aVi4ZQpaEx1BLcBm4VfB6JuQho2Ba30e1MZ1CvB7zQ6Thux1f12
+faMk34MLJ+6FAJM4KOAnFslvZ2l0VxIlBq5pbF71dO/MsIrpBWVFNGqu6jtXRUJw
+J92PbaFMi/smsgdXixsokzPmE5em3zLdp5cfHQCRBjNBclMjlnHhwQVK8wU7D609
+CPcvPS8J3PMceMeGXC1QXFANllVecmn7jECVBU5H4Ed0pb89T9Q7yWVnVBo31ZB7
+r4GuL+ECgYEAyLcE4cuPsp31oaKATSZrBmypQuGFsarddyereN8ATZ9DjbFL9Y2/
+NazLmG1KjeD1yN1q9/ek+nctKTNzuY14cVeahDoiv0ALNUOuS7IFzoHWf5SnNKEx
+oEgGJV9D6olk9YnPF5iwn/lRL84af3dxSnKr75hh8Yv5hWrPnJ95xJkCgYEAwniQ
+z6yFg2SmnzwwYV72/aoukmsI3KKBHMEDkAFOummy7iv8eT+9DLumQ9BC+mT3eFmq
+GVNVM+199NTQ5b5CzXYalSsw93rewhRkk0RVV31AJUwaRbYy6F6O502SpFYb4n8f
+S7KfDv70utGOnycMBNjeaFGWxAZbUCLjfUv8JdUCgYBb1fGz5lHPZhrXY+TUZ/mc
+LOedJFbpncZLGKmKWm5nFbHxCOg6aCrOwks9aPQtynpq93RUFMk1mIXfTh1rDuHG
+6lBWo8r2OrVmH5uGIuQpQpsEMN34ZLCyJ4I4Y0hN7aN1/SH2J/TYnViaSPEy1VHO
+wH0O2Wgm/uaiNubbQNSUMQKBgCXT5fc/i8j/LxoSTybhnhHBpMV+ZH7mbU72jIba
+ekHwhYmmrLm5GED9z12piR3Dvg9/AYNjnlM3gyS4sNm/pKbqrkkN2byJ/gKqjNXI
+mQEnr+6RWxrsUgK5QfrkL/4fcdUg/SlwWVhFZ71fPerfYYsf1ENee4Et610vLCkX
+OrjxAoGATIlZgaPuDA/Sh/YTxxSEjNZGCWx4YvWZfL+PW2ItuadMeD2lLai6lOOi
+9ew2xXZkvaeA9PGOA5YK2121M5brwkB0Kc3zNvEmrkpQDJYqeoRvLEuFGDmZ/MX1
+p0bzKs1vvh5dyFjWQ5IN9FckZ3Fpk6A1zMEuyQdk35TwX+w5EdE=
+-----END RSA PRIVATE KEY-----
--- a/project.config.json
+++ b/project.config.json
@@ -1,14 +1,31 @@
 {
-  "miniprogramRoot": "./dist",
-  "projectname": "taroApp",
+  "miniprogramRoot": "dist/",
+  "projectname": "捷兑通",
  "description": "",
  "setting": {
    "urlCheck": true,
-    "es6": false,
-    "enhance": false,
+    "es6": true,
+    "enhance": true,
    "compileHotReLoad": false,
-    "postcss": false,
-    "minified": false
-  },
-  "compileType": "miniprogram"
+    "postcss": true,
+    "minified": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "compileType": "miniprogram",
+  "appid": "wx7b3322daa2cf9c88",
+  "libVersion": "3.7.11",
+  "srcMiniprogramRoot": "dist/",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "%E6%8D%B7%E5%85%91%E9%80%9A",
+  "setting": {
+    "compileHotReLoad": false
+  }
+}
--- a/src/api/game.ts
+++ b/src/api/game.ts
@@ -0,0 +1,4 @@
+import request from '../utils/request';
+
+// 获取游戏列表
+export const getGameList = () => request('/game', {}, 'POST');
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -6,7 +6,6 @@ export default defineAppConfig({
    'pages/user/index',
    'pages/allClassList/index',
    'pages/game/gamedetail/index',
-    'pages/game/gameview/index',
    'pages/game/view/index',
    'pages/fastBuy/index',
  ],
@@ -98,12 +97,12 @@ export default defineAppConfig({
        selectedIconPath: 'static/tabbar/1-1.png',
        text: '首页',
      },
-      {
-        pagePath: 'pages/game/gamehome/index',
-        iconPath: 'static/tabbar/2-0.png',
-        selectedIconPath: 'static/tabbar/2-1.png',
-        text: '游戏',
-      },
+      // {
+      //   pagePath: 'pages/game/gamehome/index',
+      //   iconPath: 'static/tabbar/2-0.png',
+      //   selectedIconPath: 'static/tabbar/2-1.png',
+      //   text: '游戏',
+      // },
      {
        pagePath: 'pages/cart/index',
        iconPath: 'static/tabbar/3-0.png',
--- a/src/app.scss
+++ b/src/app.scss
@@ -5,8 +5,6 @@

 page {
  background-color: #f5f5f5;
-  // font-size: 30rpx;
-  // IOS安全区域
  padding-bottom: constant(safe-area-inset-bottom);
  padding-bottom: env(safe-area-inset-bottom);
 }
--- a/src/components/Cart.vue
+++ b/src/components/Cart.vue
@@ -13,8 +13,10 @@ interface CardList {
  bid: string;
  gid: string;
  number: string;
+  discount_price: string;
  price: number;
  exchange: number;
+  discount_integral: number;
 }

 const show = ref(false);
@@ -38,7 +40,11 @@ const openModal = async () => {
  show.value = !show.value;
 };

-const add_cart = async (item: CardList, num: number = 1) => {
+const add_cart = async (
+  item: CardList,
+  num: number = 1,
+  bid: string = props.merInfo.bid,
+) => {
  try {
    const res = await addCart({
      Bid: item.bid,
@@ -49,7 +55,7 @@ const add_cart = async (item: CardList, num: number = 1) => {
      title: res.msg,
      icon: 'none',
    });
-    await get_cart_list();
+    await get_cart_list(bid);
  } catch (e) {
    Taro.showToast({
      title: e.msg,
@@ -72,25 +78,29 @@ const card_list = ref<CardList[]>([]);
 const cartInfo = ref({
  count: 0,
  price: 0,
+  discount_price: 0,
  exchange: 0,
+  discount_integral: 0,
 });

-const get_cart_list = async () => {
+const get_cart_list = async (bid: string = props.merInfo.bid) => {
  try {
    const res = await getCart({
-      Bid: props.merInfo.bid,
+      Bid: bid,
    });
-
    card_list.value = res.data.data || [];
    cartInfo.value = {
      count: 0,
      price: 0,
+      discount_price: 0,
      exchange: 0,
+      discount_integral: 0,
    };
    card_list.value.forEach((item: CardList) => {
      cartInfo.value.count += Number(item.number);
-      cartInfo.value.price += Number(item.price);
+      cartInfo.value.discount_price += Number(item.price);
      cartInfo.value.exchange += Number(item.exchange);
+      cartInfo.value.discount_integral += Number(item.discount_integral);
    });
    emit('updateCart', res.data.data || []);
  } catch (e) {
@@ -142,11 +152,10 @@ const create_order = async () => {
        url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${res.data.oid}&bid=${props.merInfo.bid}`,
      });
    } else {
-      const mer_info = Taro.getStorageSync('mer_info');
      const user_info = Taro.getStorageSync('userInfo');
      const data = await getUserPoint({
        phone: user_info.data.phone,
-        bid: mer_info.bid,
+        bid: props.merInfo.bid,
      });
      res = await createActiveOrder({
        Bid: [props.merInfo.bid],
@@ -159,7 +168,7 @@ const create_order = async () => {
        };
        // isShowPay.value = true;
        Taro.navigateTo({
-          url: `/pages/goods/pay/index?oid=${res.data.oid}&bid=${mer_info.bid}&OrderType=1`,
+          url: `/pages/goods/pay/index?oid=${res.data.oid}&bid=${props.merInfo.bid}&OrderType=1`,
        });
      }
    }
@@ -193,22 +202,22 @@ defineExpose({
        <!-- <view>购物车数量: {{ cartInfo.count }}</view> -->
        <view class="cardImg">
          <image
-            src="http://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
+            src="https://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
          </image>
          <view class="count-text" v-if="cartInfo.count > 0">
            <text>{{ cartInfo.count }}</text>
          </view>
        </view>
-        <view class="ml-1">
-          <text>总金额: {{ cartInfo.price.toFixed(2) }}元</text>
+        <view class="ml-1 text-[28px]">
+          <text>总金额: {{ cartInfo.discount_price.toFixed(2) }}元</text>
          <text v-if="!IsPendingOrder"
-            >，总积分: {{ cartInfo.exchange.toFixed(2) }}</text
-          >
+            >，积分抵扣: {{ cartInfo.discount_integral.toFixed(2) }}
+          </text>
        </view>
      </view>
      <view v-if="cartInfo.count > 0" class="payBtn" @click.stop="create_order"
-        >去结算</view
-      >
+        >去结算
+      </view>
    </view>
    <!--  购物车弹窗  -->
    <nut-popup
@@ -224,7 +233,7 @@ defineExpose({
          <!-- <Del2 color="#666666" /> -->
          <image
            class="w-[20px] h-[20px]"
-            src="http://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
+            src="https://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
          <text class="text-[20px]" style="color: #666666">清空购物车</text>
        </view>
      </view>
@@ -237,7 +246,9 @@ defineExpose({

              <view class="price flex">
                <view>现金:{{ item.price }}</view>
-                <view class="ml-2">积分:{{ item.exchange }}</view>
+                <view v-if="item.discount_integral > 0" class="ml-2"
+                  >积分:{{ item.discount_integral }}</view
+                >
              </view>
            </view>
          </view>
@@ -295,21 +306,24 @@ $h-border-radius: 50px;

    .cardImg {
      position: relative;
+
      image {
        width: 60px;
        height: 60px;
      }
+
      .count-text {
        position: absolute;
        top: -10px;
        right: -10px;
-        background-image: url('http://p0.meituan.net/csc/80b0e11d4270d09324df0b802d4c479b986.png');
+        background-image: url('https://p0.meituan.net/csc/80b0e11d4270d09324df0b802d4c479b986.png');
        background-size: 100% 100%;
        // padding: 0 8px;
        width: 35px;
        height: 35px;
        text-align: center;
        line-height: 35px;
+
        text {
          margin: auto;
          font-size: 25px;
--- a/src/components/MerList.vue
+++ b/src/components/MerList.vue
@@ -2,6 +2,7 @@
  <view class="list-box">
    <view class="list">
      <swiper
+        v-if="bannerList.length !== 0"
        class="item"
        :style="{
          height: '250px',
@@ -167,7 +168,7 @@ const bannerList = ref<any[]>([]);

 const get_banner_list = async () => {
  const { data }: any = await getBanner();
-  bannerList.value = data.data;
+  bannerList.value = data.data || [];
 };

 const toPage = async (url: string) => {
@@ -253,6 +254,9 @@ Taro.useReachBottom(() => {
          .icon {
            display: inline-block;
            font-size: 30px;
+            width: 25px;
+            height: 25px;
+            margin-right: 10px;
          }

          .desc {
--- a/src/components/Pay.vue
+++ b/src/components/Pay.vue
@@ -31,7 +31,7 @@
          </template>
        </nut-cell>
        <nut-cell
-          title="天才小猪积分支付"
+          title="智多鑫积分支付"
          :desc="`剩余积分:${jfInfo.jh_info?.integral || 0}`"
          is-link
          @click="goPay(3)">
--- a/src/components/Popup.vue
+++ b/src/components/Popup.vue
@@ -2,45 +2,59 @@
 import { ref } from 'vue';
 import Taro from '@tarojs/taro';

-const show = ref(false);
-
-const overlay = ref();
+const isShow = ref(false);

 defineExpose({
-  show,
+  isShow,
 });

-defineProps({
-  src: {
+const props = defineProps({
+  imgArr: {
    required: true,
-    type: String,
-    default: '',
+    type: Array,
+    default: () => [],
  },
  type: Number,
  cb: {
-    required: true,
-    type: Function,
-    default: () => {},
+    type: Function || null,
+    default: null,
  },
 });

-Taro.useLoad(async () => {
-  if (Taro.getStorageSync('token')) show.value = true;
-  // const res = await getSignRecord()
-  // console.log(res)
+const imgs = ref(props.imgArr);
+
+const clickFn = type => {
+  if (props.cb) props.cb(type);
+  else isShow.value = false;
+};
+
+const closeFn = () => {
+  isShow.value = false;
+  imgs.value.shift(0);
+  if (imgs.value.length !== 0) isShow.value = true;
+};
+
+Taro.useLoad(() => {
+  isShow.value = true;
 });
 </script>

 <template>
  <nut-overlay
-    v-model:visible="show"
+    v-model:visible="isShow"
    :lock-scroll="true"
    :close-on-click-overlay="false">
    <view class="wrapper">
-      <view @click.stop="cb(type)">
-        <image class="image" :src="src" />
+      <view @click.stop="clickFn(type)">
+        <image
+          :style="{
+            width: imgs[0]?.naturalWidth,
+            height:
+              imgs[0]?.naturalHeight < 600 ? imgs[0]?.naturalHeight : '480px',
+          }"
+          :src="imgs[0]" />
      </view>
-      <view @click.stop="show = false">
+      <view @click.stop="closeFn">
        <image class="icon" src="../static/index/close.png" />
      </view>
    </view>
--- a/src/components/StoreList.vue
+++ b/src/components/StoreList.vue
@@ -1,6 +1,6 @@
 <template>
  <view>
-    <view class="flex justify-center" v-if="storeList.length > 0">
+    <view v-if="storeList.length > 0">
      <view
        class="bg-white rounded-[15px] mt-3 p-2 w-[95%] flex items-center"
        v-for="(item, index) in storeList"
@@ -15,6 +15,7 @@
          }}</view>
          <nut-rate
            spacing="1"
+            disabled
            active-color="rgba(252, 207, 10, 1)"
            v-model="item.rate" />
          <view class="text-[#9E9E9E] text-[25px]">销量：10000</view>
@@ -51,9 +52,10 @@ const getList = async () => {
 };

 const goDetail = item => {
+  console.log(item);
  Taro.setStorageSync('mer_info', item);
  Taro.navigateTo({
-    url: `/pages/mer/mer_detail/index`,
+    url: `/pages/mer/mer_detail/index?bid=${item.bid}`,
  });
 };
 </script>
--- a/src/index.html
+++ b/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
  <head>
    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
--- a/src/pages/admin/add_order/add_menu/index.vue
+++ b/src/pages/admin/add_order/add_menu/index.vue
@@ -27,11 +27,11 @@
                      <view class="price">
                        <text style="font-size: 15px">{{ item.number }}元</text>
                      </view>
-                      <view class="price">
+                      <!-- <view class="price">
                        <text style="font-size: 15px"
                          >{{ item.exchange }}积分</text
                        >
-                      </view>
+                      </view> -->
                    </view>
                    <nut-button
                      size="mini"
--- a/src/pages/admin/add_order/index.scss
+++ b/src/pages/admin/add_order/index.scss
@@ -3,7 +3,8 @@
  justify-content: center;
  box-sizing: border-box;
  height: 100vh;
-  background-image: url('./static/WechatIMG10.jpg');
+  // background-image: url('./static/WechatIMG10.jpg');
+  background-image: url('https://m.360buyimg.com/i/jfs/t1/288333/5/8622/43050/682e2e18Ff3a6e2af/bbc66c081c18a467.png');
  background-size: 100% 35%;
  background-repeat: no-repeat;

--- a/src/pages/admin/add_order/pending_order/components/Footer.vue
+++ b/src/pages/admin/add_order/pending_order/components/Footer.vue
@@ -79,7 +79,11 @@

 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
-import {cancelAfterOrder, confirmAfterOrder, editAfterOrder} from '@/api/admin';
+import {
+  cancelAfterOrder,
+  confirmAfterOrder,
+  editAfterOrder,
+} from '@/api/admin';
 import Taro from '@tarojs/taro';

 const props = defineProps({
--- a/src/pages/admin/add_order/pending_order/index.vue
+++ b/src/pages/admin/add_order/pending_order/index.vue
@@ -15,7 +15,7 @@
    <view v-if="listData.length > 0">
      <view
        class="card"
-        v-for="(item, index) in (listData as any[])"
+        v-for="(item, index) in listData as any[]"
        :key="index">
        <view class="header">
          <view>
--- a/src/pages/admin/order_manage/detail/index.vue
+++ b/src/pages/admin/order_manage/detail/index.vue
@@ -13,8 +13,12 @@
              <view class="flex-1">
                <view class="title">{{ item.Goods?.name }}</view>
                <view class="text-[#F83D3D] mt-5">
-                  <view>{{ item.pay_price }}元</view>
-                  <view>{{ item.pay_integral }}积分</view>
+                  <view
+                    >{{ item.pay_price }}元
+                    <text v-if="item.pay_integral > 0"
+                      >+{{ item.pay_integral }}积分</text
+                    >
+                  </view>
                </view>
              </view>
              <view class="right">
@@ -24,11 +28,13 @@
            <view
              class="flex justify-between items-center mt-2 mb-2 text-[25px]">
              <view class="text-[#9C9C9C]">{{ `共${info.count}件商品` }}</view>
-              <view
-                >{{ info.status !== 0 ? '实' : '应' }}付款{{
-                  info.pay_type === 1 ? '(元): ' : '(积分): '
-                }}{{ info.pay_type === 1 ? info.price : info.exchange }}</view
+              <text class="text-[26px] flex-1 text-right"
+                >{{ info.status !== 0 ? '实' : '应' }}付款:
+                {{ info.discount_price }} (元)
+                <text v-if="info.exchange > 0"
+                  >积分抵扣: {{ info.exchange }}</text
                >
+              </text>
            </view>
          </view>
        </template>
--- a/src/pages/admin/order_manage/index.scss
+++ b/src/pages/admin/order_manage/index.scss
@@ -63,3 +63,44 @@
    }
  }
 }
+
+.pull-down {
+  margin: 20px auto;
+  .TriangleDownBox {
+    transform: rotate(180deg);
+    transition: all 0.5s;
+  }
+
+  .TriangleUpBox {
+    transform: rotate(0deg);
+    transition: all 0.5s;
+  }
+
+  .menu {
+    .active {
+      border-radius: 10px;
+      background-color: #de1414;
+      padding: 10px 20px;
+      color: #fff;
+    }
+    .noActive {
+      border-radius: 10px;
+      padding: 10px 20px;
+      color: #000;
+      background-color: #fff;
+    }
+  }
+
+  .MenuDownBox {
+    margin-top: 5px;
+    height: 0px;
+    transition: height 0.5s ease;
+    overflow: hidden;
+  }
+  .MenuUpBox {
+    margin-top: 5px;
+    height: 80px;
+    transition: height 0.5s ease;
+    overflow: hidden;
+  }
+}
--- a/src/pages/admin/order_manage/index.vue
+++ b/src/pages/admin/order_manage/index.vue
@@ -25,6 +25,27 @@
        </view>
      </view>
    </view>
+    <view class="pull-down Card" style="background: none; padding: 0">
+      <view
+        class="mr-[5px] flex items-center justify-left"
+        @click="IsTriangleDown = !IsTriangleDown"
+        ><text>数据筛选</text>
+        <TriangleDown
+          style="width: auto"
+          :class="[!IsTriangleDown ? 'TriangleDownBox' : 'TriangleUpBox']" />
+      </view>
+      <view
+        class="flex menu justify-between text-[28px]"
+        :class="[!IsTriangleDown ? 'MenuDownBox' : 'MenuUpBox']">
+        <view
+          v-for="(item, index) in menus"
+          :key="index"
+          :class="[menuIndex === index ? 'active' : 'noActive']"
+          @click="tabChange(index)"
+          >{{ item.text }}</view
+        >
+      </view>
+    </view>
    <view class="Card">
      <view class="top"
        ><text class="iconfont icon-shujutongji icon"></text
@@ -97,6 +118,7 @@
 <script lang="ts" setup>
 import { h, ref } from 'vue';
 import Taro from '@tarojs/taro';
+import { TriangleDown } from '@nutui/icons-vue-taro';
 import { orderStatistics } from '../../../api/admin';

 Taro.useLoad(() => {
@@ -105,6 +127,30 @@ Taro.useLoad(() => {

 const orderInfo = ref<any>({});

+const IsTriangleDown = ref(false);
+
+const menuIndex = ref(0);
+
+const menus = ref([
+  {
+    text: '微信支付',
+    value: 1,
+  },
+  {
+    text: '平台积分',
+    value: 2,
+  },
+  {
+    text: '小猪积分',
+    value: 3,
+  },
+]);
+
+const tabChange = (value: number) => {
+  menuIndex.value = value;
+  getData();
+};
+
 const columns = ref([
  {
    title: '日期',
@@ -138,6 +184,7 @@ const getData = async () => {
  const user_info = Taro.getStorageSync('userInfo');
  const res = await orderStatistics({
    bid: user_info.data.bid,
+    pay_type: menus.value[menuIndex.value].value,
  });
  orderInfo.value = res.data;
 };
--- a/src/pages/admin/order_manage/list/index.vue
+++ b/src/pages/admin/order_manage/list/index.vue
@@ -56,8 +56,12 @@
            <view class="flex-1">
              <view class="title">{{ itm.Goods?.name }}</view>
              <view class="text-[#F83D3D] mt-5">
-                <view>{{ itm.pay_price }}元</view>
-                <view>{{ itm.pay_integral }}积分</view>
+                <view
+                  >{{ itm.pay_price }}元
+                  <text v-if="itm.pay_integral > 0"
+                    >+{{ itm.pay_integral }}积分</text
+                  >
+                </view>
              </view>
            </view>
            <view class="right">
@@ -69,11 +73,11 @@
          class="flex justify-between items-center mt-2 mb-2 text-[25px]"
          v-if="item.status !== 0">
          <text class="text-[#9C9C9C]">共{{ item.count }}件商品</text>
-          <view
-            >{{ item.status !== 0 ? '实' : '应' }}付款{{
-              item.pay_type === 1 ? '(元): ' : '(积分): '
-            }}{{ item.pay_type === 1 ? item.price : item.exchange }}</view
-          >
+          <text class="text-[26px] flex-1 text-right"
+            >{{ item.status !== 0 ? '实' : '应' }}付款:
+            {{ item.discount_price }} (元)
+            <text v-if="item.exchange > 0">积分抵扣: {{ item.exchange }}</text>
+          </text>
        </view>
      </view>
    </view>
--- a/src/pages/admin/statistics/index.vue
+++ b/src/pages/admin/statistics/index.vue
@@ -35,11 +35,22 @@
      </view>
    </view>
    <view class="wrapper">
+      <view class="flex justify-between">
+        <view>
          <view class="title">
            {{ title }}{{ where.type == 1 ? '营业额' : '订单量' }}
          </view>
-      <view v-if="where.type == 1" class="money">{{ dataObj.all || 0 }}</view>
+          <view v-if="where.type == 1" class="money">{{
+            dataObj.all || 0
+          }}</view>
          <view v-else class="money">{{ dataObj.all || 0 }}</view>
+        </view>
+        <view>
+          <view class="title"> {{ title }}现金部分 </view>
+          <view class="money">{{ dataObj.all_discount }}</view>
+        </view>
+      </view>
+
      <view class="increase">
        <view>
          {{ time === 'date' ? '' : title }}增长率：<text
@@ -395,6 +406,7 @@ const touchEnd = (e: any) => {
      display: flex;
      justify-content: space-between;
      align-items: center;
+
      .red {
        color: #ff6969;
      }
@@ -402,6 +414,7 @@ const touchEnd = (e: any) => {
      .green {
        color: #1abb1d;
      }
+
      .iconfont {
        font-size: 23px;
        margin-left: 15px;
@@ -428,6 +441,7 @@ const touchEnd = (e: any) => {
    .top {
      display: flex;
      align-items: center;
+
      text {
        margin-right: 5px;
      }
@@ -436,6 +450,7 @@ const touchEnd = (e: any) => {
        color: #fa2c19;
      }
    }
+
    .table {
      margin-top: 10px;
    }
--- a/src/pages/admin/verify/index.vue
+++ b/src/pages/admin/verify/index.vue
@@ -4,14 +4,86 @@
      <image
        class="image"
        @tap="scanCode"
-        src="http://p1.meituan.net/csc/696924dda634f05689dabdfbb18e88cc13551.png" />
+        src="https://p1.meituan.net/csc/696924dda634f05689dabdfbb18e88cc13551.png" />
      <view class="mt-2 text-[#7A7A7A]">扫描二维码核销</view>
    </view>
+    <view class="bg-white p-2">
+      <view class="mt-2 text-center text-[#7A7A7A]">最近核销记录</view>
+      <view v-if="list.length > 0">
+        <view
+          class="order-card"
+          v-for="(item, index) in list"
+          :key="index"
+          @click="toDetailPage(item)">
+          <view class="top">
+            <view class="text-[#9C9C9C] text-[25px]"
+              >订单号：{{ item.oid }}</view
+            >
+            <view
+              :style="{
+                color:
+                  item.status === 0
+                    ? '#FF850A'
+                    : item.status === 1
+                      ? '#F83D3D'
+                      : item.status === 2
+                        ? '#333333'
+                        : '#9C9C9C',
+              }"
+              >{{
+                item.status === 0
+                  ? '待付款'
+                  : item.status === 1
+                    ? '待使用'
+                    : item.status === 2
+                      ? '已使用'
+                      : '已失效'
+              }}
+            </view>
+          </view>
+          <view class="line"></view>
+          <view class="center" v-for="(itm, idx) in item.OrderGoods" :key="idx">
+            <view class="top">
+              <image class="mr-10" :src="itm.Goods.cover" />
+              <view class="flex-1">
+                <view class="title">{{ itm.Goods?.name }}</view>
+                <view class="text-[#F83D3D] mt-5">
+                  <view
+                    >{{ itm.pay_price }}元
+                    <text v-if="itm.pay_integral > 0"
+                      >+{{ itm.pay_integral }}积分</text
+                    >
+                  </view>
+                </view>
+              </view>
+              <view class="right">
+                <view>x{{ itm.number }}</view>
+              </view>
+            </view>
+          </view>
+          <view
+            class="flex justify-between items-center mt-2 mb-2 text-[25px]"
+            v-if="item.status !== 0">
+            <text class="text-[#9C9C9C]">共{{ item.count }}件商品</text>
+            <text class="text-[26px] flex-1 text-right"
+              >{{ item.status !== 0 ? '实' : '应' }}付款:
+              {{ item.discount_price }} (元)
+              <text v-if="item.exchange > 0"
+                >积分抵扣: {{ item.exchange }}</text
+              >
+            </text>
+          </view>
+        </view>
+      </view>
+      <nut-empty v-else description="暂无数据"></nut-empty>
+    </view>
  </view>
 </template>

 <script setup lang="ts">
 import Taro from '@tarojs/taro';
+import { getActiveOrderList } from '@/api/admin';
+import { ref } from 'vue';

 // url参数转对象
 // const urlParse = (url: string) => {
@@ -47,12 +119,42 @@ const scanCode = () => {
    },
  });
 };
+
+Taro.useLoad(() => {
+  getListOne();
+});
+
+const list = ref<any[]>([]);
+
+const getListOne = async () => {
+  try {
+    const { data } = Taro.getStorageSync('userInfo');
+    const res = await getActiveOrderList({
+      PageNum: 1,
+      PageSize: 1,
+      bid: data.bid,
+      status: 0,
+    });
+    list.value = [res.data.data[0]];
+
+    console.log(list.value);
+  } catch (error) {
+    console.log(error);
+  }
+};
+
+const toDetailPage = (item: any) => {
+  Taro.setStorageSync('ver_order_info', item);
+  Taro.navigateTo({
+    url: '/pages/admin/order_manage/detail/index',
+  });
+};
 </script>

 <style lang="scss">
 page {
  background-color: #f5f5f5;
-  background-image: url('http://p0.meituan.net/csc/e6ff5582788af2023f49241afe22fc89391851.png');
+  background-image: url('https://p0.meituan.net/csc/e6ff5582788af2023f49241afe22fc89391851.png');
  background-repeat: no-repeat;
  background-size: 100% 25%;
 }
@@ -62,7 +164,7 @@ page {
  height: 300px;
  box-sizing: border-box;
  background-color: #fff;
-  margin: 300px auto;
+  margin: 300px auto 50px auto;
  border-radius: 33px;
  display: flex;
  flex-direction: column;
@@ -75,4 +177,62 @@ page {
    height: 150px;
  }
 }
+
+.order-card {
+  box-sizing: border-box;
+  margin: 15px auto;
+  background-color: #fff;
+  padding: 20px;
+
+  .line {
+    width: 100%;
+    height: 1px;
+    background-color: #f5f5f5;
+    margin: 10px;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .btn {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+
+  .center {
+    // margin-bottom: 10px;
+    .top {
+      display: flex;
+      // justify-content: space-between;
+      align-items: flex-start;
+
+      image {
+        width: 150px;
+        height: 150px;
+        border-radius: 15px;
+        margin-right: 10px;
+      }
+
+      .title {
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        text-overflow: ellipsis;
+        width: 350px;
+      }
+
+      .right {
+        margin-left: 10px;
+        font-size: 28px;
+        text-align: right;
+        color: #9c9c9c;
+      }
+    }
+  }
+}
 </style>
--- a/src/pages/admin/verify/verify_list/index.vue
+++ b/src/pages/admin/verify/verify_list/index.vue
@@ -23,13 +23,12 @@
        <text class="text-[#9C9C9C] text-left"
          >共{{ goodInfo.count }}件商品</text
        >
-        <text class="flex-1"
-          >{{ goodInfo.status !== 0 ? '实' : '应' }}付款{{
-            goodInfo.pay_type === 1 ? '(元): ' : '(积分): '
-          }}{{
-            goodInfo.pay_type === 1 ? goodInfo.price : goodInfo.exchange
-          }}</text
+        <text class="text-[26px] flex-1"
+          >实付款: {{ goodInfo.discount_price }} (元)
+          <text v-if="goodInfo.exchange > 0"
+            >积分抵扣: {{ goodInfo.exchange }}</text
          >
+        </text>
      </view>
      <!-- <view class="line"></view> -->
      <!-- <view class="cz">
@@ -98,15 +97,21 @@ const subVerify = async () => {
      oid: goodInfo.value.oid,
      bid: goodInfo.value.bid,
    });
-    Taro.showToast({
-      title: res.msg,
-      icon: 'none',
-    });
+    //Taro.showToast({
+    //  title: res.msg,
+    //  icon: 'none',
+    //});
+    Taro.showModal({
+      title: '核销成功',
+      content: res.msg,
+      success: () => {
        setTimeout(() => {
          Taro.navigateBack({
            delta: 1,
          });
        }, 3000);
+      },
+    });
  } catch (error) {
    Taro.showToast({
      title: error.msg,
@@ -123,7 +128,9 @@ const getPayType = (type: number) => {
    case 2:
      return '平台积分支付';
    case 3:
-      return '天才小猪支付';
+      return '智多鑫积分支付';
+    case 3:
+      return '渔乐潮玩支付';
    default:
      return '未知';
  }
--- a/src/pages/admin/withdrawal/index.config.ts
+++ b/src/pages/admin/withdrawal/index.config.ts
@@ -1,4 +1,4 @@
 export default definePageConfig({
-  navigationBarTitleText: '收益提现',
+  navigationBarTitleText: '余额提现',
  enablePullDownRefresh: true,
 });
--- a/src/pages/admin/withdrawal/index.scss
+++ b/src/pages/admin/withdrawal/index.scss
@@ -41,7 +41,7 @@

 .card {
  margin: 20px auto;
-  background-image: url('http://p0.meituan.net/csc/902ecf4ba9765a8200817d58a3a5a655172781.png');
+  background-image: url('https://p0.meituan.net/csc/902ecf4ba9765a8200817d58a3a5a655172781.png');
  background-size: 100% 100%;
  width: 95%;
  height: 250px;
@@ -54,7 +54,7 @@
    color: #fff;
    padding: 45px 100px;
    display: flex;
-    justify-content: space-between;
+    justify-content: center;
    align-items: center;
    text-align: center;

--- a/src/pages/admin/withdrawal/index.vue
+++ b/src/pages/admin/withdrawal/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import {ref, h} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
 import { getWithdrawList, addWithdraw } from '@/api/admin';

@@ -79,33 +79,21 @@ const add = async () => {
 const rules = ref({
  num: [
    {
-      message: '请填写提现积分',
+      message: '请填写提现余额',
      validator: (value, _) => {
-        if (!value) {
-          return false;
-        } else {
-          return true;
-        }
+        return value;
      },
    },
    {
-      message: '提现积分最低为100',
+      message: '提现余额最低为1元',
      validator: (value, _) => {
-        if (Number(value) < 100) {
-          return false;
-        } else {
-          return true;
-        }
+        return Number(value) >= 1;
      },
    },
    {
-      message: '提现积分不能大于可提现积分',
+      message: '提现余额不能大于可提现余额',
      validator: (value, _) => {
-        if (Number(value) > row.value) {
-          return false;
-        } else {
-          return true;
-        }
+        return Number(value) <= row.value;
      },
    },
  ],
@@ -142,15 +130,15 @@ Taro.useReachBottom(() => {
  <view>
    <view class="card">
      <view class="container">
-        <view class="">
+        <view>
          <view class="font-bold text-[35px]">{{ row }}</view>
-          <view class="text-[25px] mt-2">可提现积分</view>
+          <view class="text-[25px] mt-2">可提现余额</view>
        </view>
-        <view class="line"></view>
+        <!-- <view class="line"></view>
        <view class="">
          <view class="font-bold text-[35px]">{{ str }}</view>
          <view class="text-[25px] mt-2">实际到账</view>
-        </view>
+        </view> -->
      </view>
      <view class="footer">
        <text>到账方式</text>
@@ -164,11 +152,11 @@ Taro.useReachBottom(() => {
    </view>
    <view class="formCard">
      <view class="flex justify-between mb-[25px]">
-        <text>积分提现</text>
+        <text>余额提现</text>
        <!-- <view class="flex items-center" @click="visible1 = true">
          <image
            class="w-[26px] h-[26px]"
-            src="http://p1.meituan.net/csc/5437a800f4ed4a49f14984494c1c3077994.png"></image>
+            src="https://p1.meituan.net/csc/5437a800f4ed4a49f14984494c1c3077994.png"></image>
          <view class="text-[#EC4443] text-[26px] ml-1">提现疑问</view>
        </view> -->
      </view>
@@ -177,7 +165,7 @@ Taro.useReachBottom(() => {
          <nut-input
            v-model="basicData.num"
            class="nut-input-text"
-            placeholder="请输入提现积分"
+            placeholder="请输入提现余额"
            type="text">
            <template #right>
              <text
@@ -221,7 +209,7 @@ Taro.useReachBottom(() => {
        </view>
        <view>
          <view class="mt-3 mb-3 text-[35px]">￥{{ item.number }}</view>
-          <view class="text-[25px] mb-1">提现积分：{{ item.integral }}</view>
+          <view class="text-[25px] mb-1">提现金额：{{ item.integral }}</view>
          <view class="text-[25px] mb-1"
            >信息服务费：{{ item.commission }}</view
          >
@@ -236,8 +224,8 @@ Taro.useReachBottom(() => {
            v-if="item.status === 1"
            class="text-[23px] mt-2 text-[#df3526]"
            @click="openPreview(item)"
-            >点我查看回执单</view
-          >
+            >点我查看回执单
+          </view>
        </view>
      </view>
    </view>
--- a/src/pages/cart/index.vue
+++ b/src/pages/cart/index.vue
@@ -20,10 +20,14 @@
              <view class="box-left">
                <img class="cover" :src="item.cover" alt="" />
                <view class="center">
-                  <view>{{ item.name }}</view>
+                  <view class="line-clamp-2 text-[25px]">{{ item.name }}</view>
                  <view class="price">
-                    <view>{{ item.price }} 元</view>
-                    <view>{{ item.exchange }} 积分</view>
+                    <view
+                      >{{ item.price }}元
+                      <text v-if="item.discount_integral > 0"
+                        >+{{ item.discount_integral }}积分</text
+                      >
+                    </view>
                  </view>
                </view>
              </view>
@@ -40,7 +44,7 @@
    </view>
    <nut-empty v-else description="购物车暂无数据"></nut-empty>
    <view>
-      <view style="height: 100rpx"></view>
+      <view style="height: 100px"></view>
    </view>
    <view class="bottom-box" v-if="list.length > 0">
      <view class="left">
@@ -90,6 +94,8 @@ interface CardList {
  number: string;
  price: number;
  exchange: number;
+  pay_price: number;
+  discount_integral: number;
 }

 // const selectAllVal = ref(false);
@@ -139,7 +145,7 @@ const changeBox = (label: string[], item: any) => {
      item.Goods.forEach((itm: any) => {
        if (itm.gid === id) {
          item['Count'].priceCount += itm.price;
-          item['Count'].exchangeCount += itm.exchange;
+          item['Count'].exchangeCount += itm.discount_integral;
        }
      });
    });
@@ -187,6 +193,8 @@ const isShowPay = ref(false);
 const orderData = ref<any>([]);

 const sub = async () => {
+  try {
+    console.log('sub');
    const arr: any = list.value.filter(
      (item: any) => item.state.checkboxgroup.length > 0,
    );
@@ -198,7 +206,6 @@ const sub = async () => {
      });
      return;
    }
-  try {
    const { data: res } = await createActiveOrder({
      Bid: arr.map((item: any) => item.StoreBid),
    });
@@ -212,7 +219,7 @@ const sub = async () => {
    }
  } catch (e) {
    Taro.showToast({
-      title: e.msg,
+      title: e.msg || '订单创建失败',
      icon: 'none',
    });
  }
@@ -308,16 +315,18 @@ const add_cart = async (item: CardList, num: number = 1) => {
    align-items: center;

    .cover {
-      width: 130rpx;
-      height: 130rpx;
-      margin-right: 15rpx;
-      border-radius: 20rpx;
+      width: 130px;
+      height: 130px;
+      min-width: 130px;
+      min-height: 130px;
+      margin-right: 15px;
+      border-radius: 20px;
    }

    .center {
      display: flex;
      flex-direction: column;
-      justify-content: space-around;
+      justify-content: space-between;

      .price {
        display: flex;
@@ -335,21 +344,21 @@ const add_cart = async (item: CardList, num: number = 1) => {
  bottom: 0;
  left: 0;
  width: 100%;
-  height: 100rpx;
+  height: 100px;
  z-index: 9999;
  display: flex;
  justify-content: space-between;
  align-items: center;
-  padding: 0 20rpx;
-  box-shadow: 100rpx 104rpx 288rpx rgba(0, 0, 0, 0.01);
-  border-top: 1rpx solid #f5f5f5;
+  padding: 0 20px;
+  box-shadow: 100px 104px 288px rgba(0, 0, 0, 0.01);
+  border-top: 1px solid #f5f5f5;

  .left {
    display: flex;
    align-items: center;

    .text-box {
-      margin-left: 10rpx;
+      margin-left: 10px;
    }
  }
 }
--- a/src/pages/category/index.vue
+++ b/src/pages/category/index.vue
@@ -10,12 +10,12 @@
    @change="tabChange">
    <nut-tab-pane
      v-for="item in list"
-      :title="(item.name as string)"
+      :title="item.name as string"
      :key="item.ID">
      <view v-if="goodList.length > 0">
        <view
          class="list"
-          v-for="(item, index) in (goodList as any)"
+          v-for="(item, index) in goodList as any"
          :key="index">
          <view class="item">
            <img :src="item.cover" />
--- a/src/pages/game/gamedetail/index.config.ts
+++ b/src/pages/game/gamedetail/index.config.ts
@@ -1,4 +1,4 @@
 export default definePageConfig({
  navigationBarTitleText: '游戏详情',
-  navigationStyle: 'custom',
+  // navigationStyle: 'custom',
 });
--- a/src/pages/game/gamedetail/index.scss
+++ b/src/pages/game/gamedetail/index.scss
@@ -0,0 +1,43 @@
+// page {
+//   font-size: 10px;
+// }
+
+.index {
+  position: relative;
+  width: 100%;
+  height: 100vh;
+
+  .swiper {
+    background-color: white;
+    width: 100%;
+  }
+
+  .container {
+    z-index: 1;
+    position: absolute;
+    top: 260px;
+    background-color: white;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 10px;
+    text-align: center;
+    border-top-left-radius: 20px;
+    border-top-right-radius: 20px;
+
+    .btn {
+      margin: 20px auto;
+      padding: 10px;
+      border-radius: 50px;
+      background-color: #7950f2;
+      color: #fff;
+      width: 300px;
+      text-align: center;
+      border: 1px solid #f5f5f5;
+    }
+  }
+}
+.text {
+  padding: 10px;
+  font-size: 30px;
+  text-align: left;
+}
--- a/src/pages/game/gamedetail/index.vue
+++ b/src/pages/game/gamedetail/index.vue
@@ -1,153 +1,52 @@
 <template>
-  <view>
-    <view
-      class="head-wrapper"
-      :style="{
-        top: statusHeight + 'px',
-      }">
-      <view class="head-menu">
-        <Left class="iconfont" @click="returns" />
-        <Home class="iconfont" @click="goHome" />
-      </view>
-    </view>
-    <nut-swiper
-      class="swiper"
-      :pagination-visible="true"
-      pagination-color="#426543"
-      auto-play="3000">
-      <nut-swiper-item>
-        <image
-          src="https://storage.360buyimg.com/jdc-article/NutUItaro34.jpg"
-          alt="" />
-      </nut-swiper-item>
-      <nut-swiper-item>
-        <image
-          src="https://storage.360buyimg.com/jdc-article/NutUItaro2.jpg"
-          alt="" />
-      </nut-swiper-item>
-      <nut-swiper-item>
-        <image
-          src="https://storage.360buyimg.com/jdc-article/welcomenutui.jpg"
-          alt="" />
-      </nut-swiper-item>
-      <nut-swiper-item>
-        <image
-          src="https://storage.360buyimg.com/jdc-article/fristfabu.jpg"
-          alt="" />
-      </nut-swiper-item>
-    </nut-swiper>
-    <view class="box">
-      <view class="line"></view>
-      <view class="game-title"></view>
-      <view class="game-title"></view>
-      <view class="game-title"></view>
-      <view class="game-btn" @click="toGame()">开始游戏</view>
+  <view class="index">
+    <swiper class="swiper" :circular="true" :autoplay="true">
+      <swiper-item v-for="(item, index) in list" :key="index">
+        <image style="width: 100%" :src="item" />
+      </swiper-item>
+    </swiper>
+    <view class="container">
+      <rich-text :nodes="info.introduction"></rich-text>
+      <view class="btn" @click="startGame()">开始游戏</view>
    </view>
  </view>
 </template>

-<script setup lang="ts">
+<script lang="ts" setup>
 import { ref } from 'vue';
-import {
-  useLoad,
-  getSystemInfoSync,
-  navigateBack,
-  switchTab,
-  navigateTo,
-} from '@tarojs/taro';
-import {Left, Home} from '@nutui/icons-vue-taro';
-var statusBarHeight = getSystemInfoSync().statusBarHeight as number;
+import Taro from '@tarojs/taro';
+import './index.scss';

-console.log(statusBarHeight);
+const info = ref<any>({});
+const list = ref<string[]>([]);

-const statusHeight = ref<number>(statusBarHeight);
-
-// const swiperList = ref([]);
-
-useLoad(options => {
-  console.log(options);
+Taro.useLoad(() => {
+  info.value = Taro.getStorageSync('gameItem');
+  list.value.push(info.value.cover);
 });

-const returns = () => {
-  navigateBack();
-};
-
-const goHome = () => {
-  switchTab({
-    url: '/pages/index/index',
+const startGame = () => {
+  // 判断url中是否含有http
+  if (info.value.url.indexOf('http') === -1) {
+    Taro.navigateTo({
+      url: info.value.url,
    });
-};
-
-const toGame = () => {
-  navigateTo({
-    url: '/pages/game/gameview/index',
+  } else {
+    const user = Taro.getStorageSync('userInfo');
+    // if (user.data.pulse <= 0)
+    //   return Taro.showToast({
+    //     title: '您的豆子不足，无法进入游戏',
+    //     icon: 'none',
+    //   });
+    Taro.setStorageSync(
+      'game_url',
+      `${info.value.url}?uid=${Taro.getStorageSync('token')}&id=${
+        info.value.ID
+      }`,
+    );
+    Taro.navigateTo({
+      url: `/pages/game/view/index`,
    });
+  }
 };
 </script>
-
-<style lang="scss">
-.head-wrapper {
-  z-index: 999;
-  display: flex;
-  align-items: center;
-  position: fixed;
-  left: 30px;
-  top: 0;
-  height: 100px;
-}
-.head-menu {
-  display: flex;
-  align-items: center;
-  height: 54px;
-  width: 140px;
-  background: rgba(0, 0, 0, 0.25);
-  border-radius: 27px;
-  .iconfont {
-    flex: 1;
-    text-align: center;
-    color: #fff;
-    box-sizing: border-box;
-    &.icon-xiangzuo {
-      border-right: 1px solid #fff;
-    }
-  }
-}
-.swiper {
-  height: 450rpx;
-  width: 100vw;
-  image {
-    width: 100%;
-  }
-}
-
-.box {
-  width: 100%;
-  height: 90vh;
-  background-color: #fff;
-  z-index: 1;
-  border-top-left-radius: 20px;
-  border-top-right-radius: 20px;
-  box-sizing: border-box;
-  position: absolute;
-  padding: 20px;
-  top: 400px;
-
-  .line {
-    width: 90px;
-    height: 10px;
-    border-radius: 4px;
-    background-color: rgba(202, 202, 202, 1);
-    margin: auto;
-  }
-  .game-btn {
-    width: 300px;
-    height: 75px;
-    margin: 50px auto;
-    color: #fff;
-    background-color: rgba(85, 77, 132, 1);
-    border-radius: 50px;
-    text-align: center;
-    line-height: 75px;
-  }
-}
-</style>
--- a/src/pages/game/gamehome/index.config.ts
+++ b/src/pages/game/gamehome/index.config.ts
@@ -1,3 +1,4 @@
 export default definePageConfig({
-  navigationBarTitleText: '',
+  navigationBarTitleText: '游戏大厅',
+  // navigationStyle: 'custom',
 });
--- a/src/pages/game/gamehome/index.vue
+++ b/src/pages/game/gamehome/index.vue
@@ -1,20 +1,32 @@
 <template>
-  <view>
-    <web-view :src="url"></web-view>
+  <view class="index">
+    <!-- <view class="title">游戏大厅</view> -->
+    <view class="card_list">
+      <view
+        class="card_item"
+        v-for="item in list"
+        :key="item.ID"
+        :style="{ backgroundImage: `url(${item.cover})` }"
+        @click="toPage(item)"></view>
+    </view>
  </view>
 </template>

 <script setup lang="ts">
 import { ref } from 'vue';
 import Taro from '@tarojs/taro';
+import { getPersonalInfo } from '@/api/user';
+import { getGameList } from '@/api/game';

-const url = ref('');
+const list = ref<any[]>([]);

 Taro.useDidShow(() => {
  const token = Taro.getStorageSync('token');
-  // url.value = 'http://huakk.jdt168.com/#/pages/index/index';
+  // url.value = 'https://huakk.jdt168.com/#/pages/index/index';
  if (token) {
-    url.value = `${process.env.TARO_APP_GAME}${Taro.getStorageSync('token')}`;
+    // url.value = `${process.env.TARO_APP_GAME}${Taro.getStorageSync('token')}`;
+    getUserInfo();
+    getList();
  } else {
    Taro.showToast({
      title: '请先登录,再尝试进入游戏大厅。',
@@ -27,6 +39,77 @@ Taro.useDidShow(() => {
    }, 1000);
  }
 });
+
+const getUserInfo = async () => {
+  const res = await getPersonalInfo();
+  const userInfo = {
+    ...res.data,
+    data: {
+      ...res.data.data,
+      permission: res.data.data.permission
+        ? JSON.parse(res.data.data.permission)
+        : {},
+    },
+  };
+  Taro.setStorageSync('userInfo', userInfo);
+};
+
+const getList = async () => {
+  // console.log(process.env.TARO_APP_HALL_API)
+  const res = await getGameList();
+  list.value = res.data.data.sort((a: any, b: any) => b.sort - a.sort) || [];
+};
+
+const toPage = item => {
+  Taro.setStorageSync('gameItem', item);
+  Taro.navigateTo({
+    url: `/pages/game/gamedetail/index`,
+  });
+};
 </script>

-<style lang="scss"></style>
+<style lang="scss">
+.index {
+  padding-top: 10px;
+  width: 100%;
+  height: 100vh;
+
+  .title {
+    margin: 60px;
+    font-size: 50px;
+  }
+
+  .card_list {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+
+    .card_item {
+      width: 700px;
+      height: 300px;
+      background-color: #fff;
+      margin-bottom: 20px;
+      border-radius: 20px;
+      text-align: center;
+      line-height: 300px;
+      //   background-image: url('../../static/qietu.png');
+      background-size: 100% 100%;
+      position: relative;
+
+      // .btn {
+      //   position: absolute;
+      //   width: 150px;
+      //   height: 100px;
+      //   background-image: url('../../static/an.png');
+      //   background-size: 100% 100%;
+      //   right: 30px;
+      //   bottom: 10px;
+
+      //   &:active {
+      //     transform: scale(1.1);
+      //   }
+      // }
+    }
+  }
+}
+</style>
--- a/src/pages/game/gameview/index.config.ts
+++ b/src/pages/game/gameview/index.config.ts
@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: 'GameView',
-});
--- a/src/pages/game/gameview/index.vue
+++ b/src/pages/game/gameview/index.vue
@@ -1,20 +0,0 @@
-<template>
-  <web-view
-    style="height: 100vh; width: 100vw"
-    :src="`https://www.jdt168.com/public/?uid=${user.uid}`"></web-view>
-</template>
-
-<script setup lang="ts">
-import {ref} from 'vue';
-import {getStorageSync, useLoad} from '@tarojs/taro';
-import {WebView} from '@tarojs/components';
-
-const user = ref<any>({});
-
-useLoad(() => {
-  user.value = getStorageSync('userInfo');
-  console.log(user);
-});
-</script>
-
-<style lang="scss"></style>
--- a/src/pages/game/view/index.vue
+++ b/src/pages/game/view/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <web-view style="height: 100vh; width: 100vw" :src="url"></web-view>
+  <web-view class="web-view" :src="url"></web-view>
 </template>

 <script setup lang="ts">
@@ -14,4 +14,10 @@ useDidShow(() => {
 });
 </script>

-<style lang="scss"></style>
+<style lang="scss">
+.web-view {
+  // 适配ios底部安全区域
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
+</style>
--- a/src/pages/goods/goods_detail/index.vue
+++ b/src/pages/goods/goods_detail/index.vue
@@ -20,13 +20,12 @@
    <view class="card">
      <view class="flex items-center justify-between">
        <view class="flex items-center">
-          <nut-price size="large" :price="goodInfo.number"></nut-price>
-          <view class="ml-5 line"></view>
+          <nut-price size="large" :price="goodInfo.discount_price"></nut-price>
          <nut-price
-            class="ml-5"
+            v-if="goodInfo.exchange"
            size="large"
            :price="goodInfo.exchange"
-            symbol="积分"></nut-price>
+            symbol="+积分"></nut-price>
        </view>
        <nut-button
          size="small"
@@ -38,15 +37,17 @@
        </nut-button>
      </view>
      <view class="flex items-center justify-between mt-3">
-        <view class="title text-lg">{{ goodInfo.name }}</view>
-        <view class="stock text-[#9E9E9E]"> 库存:{{ goodInfo.stock }}</view>
+        <view class="title text-[25px]">{{ goodInfo.name }}</view>
      </view>
+      <view class="stock text-[#9E9E9E] text-[25px] mt-[10px]"
+        >库存: {{ goodInfo.stock }}</view
+      >
      <view class="line1"></view>
      <view class="sub">{{ goodInfo.profile }}</view>
    </view>
    <!-- 商品详情 -->
    <view class="rich-box">
-      <view class="title">-----商品详情-----</view>
+      <view class="title">商品详情</view>
      <rich-text
        v-if="goodInfo.details"
        class="rich"
@@ -64,7 +65,7 @@
 import { Ref, ref } from 'vue';
 import Taro from '@tarojs/taro';
 import { Home, Left } from '@nutui/icons-vue-taro';
-import {getActiveGoodsDetail} from '@/api/goods';
+import { getActiveGoodsDetail, getMerDetail } from '@/api/goods';
 import Cart from '@/components/Cart.vue';
 import { Cart2 } from '@nutui/icons-vue-taro';
 import { nextTick } from 'vue';
@@ -86,18 +87,28 @@ interface GoodInfo {
  profile?: string;
  price?: number;
  cartNum?: number;
+  discount_price?: number;
 }

 const goodInfo = ref<GoodInfo>({});

+const bid = ref('');
+
 Taro.useLoad(async options => {
  await get_good_detail(options.gid);
-  mer_info.value = Taro.getStorageSync('mer_info');
+  bid.value = options.bid;
+
+  await getMerInfo();
  await nextTick(async () => {
-    await cartRef.value.get_cart_list();
+    await cartRef.value.get_cart_list(bid.value);
  });
 });

+const getMerInfo = async () => {
+  const res = await getMerDetail({ bid: bid.value });
+  mer_info.value = res.data.data;
+};
+
 Taro.useShareAppMessage(() => ({
  title: `捷兑通-${goodInfo.value.name}`,
  path: `/pages/goods/goods_detail/index?gid=${goodInfo.value.gid}&type=1`,
@@ -149,7 +160,7 @@ const cartRef = ref(null) as Ref;
 const add_cart = async (item: any) => {
  const num = item.cartNum ? Number(item.cartNum) + 1 : 1;
  await nextTick(async () => {
-    await cartRef.value.add_cart(item, num);
+    await cartRef.value.add_cart(item, num, bid.value);
  });
 };

@@ -219,7 +230,7 @@ page {
  margin: auto;

  .sub {
-    font-size: 30px;
+    font-size: 25px;
    color: #999;
  }
 }
@@ -227,7 +238,7 @@ page {
 .rich-box {
  background-color: #fff;
  margin-top: 20px;
-  width: 100vw;
+  //width: 100vw;
  box-sizing: border-box;
  text-align: center;
  padding: 15px 0;
@@ -239,10 +250,6 @@ page {
    font-weight: bold;
    color: #333;
  }
-
-  .rich {
-    width: 100%;
-  }
 }

 .nut-sku {
@@ -305,6 +312,7 @@ page {
  height: 30px;
  background-color: #8f8f8f;
 }
+
 .line1 {
  width: 100%;
  height: 1px;
--- a/src/pages/goods/pay/index.config.ts
+++ b/src/pages/goods/pay/index.config.ts
@@ -1,3 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '支付订单',
+  navigationBarTitleText: '确认订单',
 });
--- a/src/pages/goods/pay/index.scss
+++ b/src/pages/goods/pay/index.scss
@@ -37,3 +37,61 @@
    }
  }
 }
+
+.order-card {
+  width: 95%;
+  box-sizing: border-box;
+  margin: 10px auto;
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 20px;
+
+  .line {
+    width: 100%;
+    height: 1px;
+    background-color: #f5f5f5;
+    margin: 20px auto;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .btn {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+
+  .center {
+    .top {
+      display: flex;
+      align-items: flex-start;
+
+      image {
+        width: 150px;
+        height: 150px;
+        border-radius: 15px;
+        margin-right: 20px;
+      }
+
+      .title {
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        text-overflow: ellipsis;
+        width: 350px;
+      }
+
+      .right {
+        margin-left: 10px;
+        font-size: 28px;
+        text-align: right;
+        color: #9c9c9c;
+      }
+    }
+  }
+}
--- a/src/pages/goods/pay/index.vue
+++ b/src/pages/goods/pay/index.vue
@@ -1,13 +1,58 @@
 <template>
  <view class="flex flex-col items-center justify-center">
-    <view class="mt-6 text-[#8C8C8C] text-[25px]"
-      >交易剩余时间：{{ tStr }}
+    <!--    <view class="mt-6 text-[#8C8C8C] text-[25px]"-->
+    <!--    >交易剩余时间：{{ tStr }}-->
+    <!--    </view>-->
+    <!--    <view class="flex items-center mt-5 mb-5">-->
+    <!--      <nut-price :price="a" size="large" />-->
+    <!--      <view class="line"></view>-->
+    <!--      <nut-price position="after" symbol="积分" :price="b" size="large" />-->
+    <!--    </view>-->
+    <!--  商品信息  -->
+    <view class="w-full" v-for="(itm, idx) in orderData" :key="idx">
+      <view class="order-card">
+        <view class="mb-[10px] text-[28px] text-[#9C9C9C]"
+          >{{ itm.Store.name }}
        </view>
-    <view class="flex items-center mt-5 mb-5">
-      <nut-price :price="a" size="large" />
-      <view class="line"></view>
-      <nut-price position="after" symbol="积分" :price="b" size="large" />
+        <view
+          class="center mb-[20px]"
+          v-for="(item, index) in itm.OrderGoods"
+          :key="index">
+          <view class="top">
+            <image :src="item.Goods.cover" />
+            <view class="flex flex-col justify-between flex-1 h-[150px]">
+              <view class="title line-clamp-2 text-[25px]"
+                >{{ item.Goods?.name }}
              </view>
+              <view class="text-[#F83D3D] mt-5">
+                <view
+                  >￥{{ item.pay_price }}元
+                  <text v-if="item.pay_integral > 0"
+                    >+{{ item.pay_integral }}积分</text
+                  >
+                </view>
+              </view>
+            </view>
+            <view class="right">
+              <view>x{{ item.number }}</view>
+            </view>
+          </view>
+        </view>
+        <!-- <view class="line"></view> -->
+        <view
+          class="flex justify-between items-center mt-2 mb-2 text-[25px] text-right">
+          <text class="text-[#9C9C9C] text-[28px]"
+            >共{{ itm.count }}件商品
+          </text>
+          <text class="text-[26px]"
+            >应付款: ￥{{ itm.discount_price }}元
+            <text v-if="itm.exchange > 0"> 积分抵扣: {{ itm.exchange }}</text>
+          </text>
+          <!-- <view class="line"></view> -->
+        </view>
+      </view>
+    </view>
+
    <!-- {{ payVal }} -->
    <nut-radio-group class="w-[95%]" v-model="payVal">
      <nut-cell-group class="w-full">
@@ -17,7 +62,13 @@
          :key="index"
          class="flex items-center"
          :title="item.name"
-          :desc="item.number > 0 ? `可用积分:${item.number}` : ''"
+          :desc="
+            item.number > 0
+              ? `可用积分:${item.number}`
+              : item.name.includes('微信')
+                ? '微信全额支付'
+                : ''
+          "
          @click="cellClick(item.ID)">
          <template #icon>
            <IconFont size="30" :name="item.icon" />
@@ -26,76 +77,19 @@
            <nut-radio :label="item.ID"></nut-radio>
          </template>
        </nut-cell>
-        <!-- <nut-cell
-          class="flex items-center"
-          title="平台积分支付"
-          :desc="`剩余积分:${orderData.User?.integral || 0}`"
-          @click="cellClick(2, orderData.User?.integral === 0)">
-          <template #icon>
-            <IconFont size="30" :name="require('../../../static/pt.png')" />
-          </template>
-          <template #link>
-            <nut-radio
-              :disabled="orderData.User?.integral === 0"
-              :label="2"></nut-radio>
-          </template>
-        </nut-cell>
-        <nut-cell
-          class="flex items-center"
-          title="天才小猪积分支付"
-          :desc="`剩余积分:${orderData.integral || 0}`"
-          @click="cellClick(3, orderData.integral === 0)">
-          <template #icon>
-            <IconFont size="30" :name="require('../../../static/jh.png')" />
-          </template>
-          <template #link>
-            <nut-radio
-              :disabled="orderData.integral === 0"
-              :label="3"></nut-radio>
-          </template>
-        </nut-cell> -->
      </nut-cell-group>
    </nut-radio-group>
-    <view class="w-[90%] mt-[100px]">
+    <view class="w-[90%] mt-[30px]">
      <nut-button
        shape="square"
        :loading="isLoading"
+        :disabled="isLoading"
        type="primary"
        block
        @click="pay"
        >确认支付
      </nut-button>
    </view>
-
-    <nut-short-password
-      title="请输入交易密码"
-      tips="忘记密码"
-      desc=" "
-      :error-msg="error_msg"
-      v-model="shortVal"
-      v-model:visible="visible"
-      :length="6"
-      :close-on-click-overlay="false"
-      @focus="showKeyboard = true"
-      @complete="shortComplete"
-      @close="shortClose"
-      @tips="onTips">
-    </nut-short-password>
-    <nut-number-keyboard
-      v-model="shortVal"
-      v-model:visible="showKeyboard"
-      @blur="showKeyboard = false">
-    </nut-number-keyboard>
-
-    <nut-dialog
-      title="设置交易密码"
-      content="您还未设置交易密码，请前往设置"
-      cancel-text="其他支付方式"
-      ok-text="设置交易密码"
-      v-model:visible="visible2"
-      @cancel="visible2 = false"
-      @ok="onTips">
-    </nut-dialog>
  </view>
 </template>

@@ -103,10 +97,8 @@
 import Taro from '@tarojs/taro';
 import { IconFont } from '@nutui/icons-vue-taro';
 import { onUnmounted, ref } from 'vue';
-import {getActiveOrderDetail, checkTradePwd, getPayList} from '@/api/goods';
-import {getUserPoint} from '@/api/admin';
+import { getActiveOrderDetail, getPayList } from '@/api/goods';
 import { payOrder } from '@/api/order';
-import {isCheckTradePwd} from '@/api/user';
 import * as dayjs from 'dayjs';

 const payVal = ref();
@@ -115,20 +107,10 @@ const t_id = ref();

 const tStr = ref('00:00');

-const error_msg = ref('');
-
-const shortVal = ref('');
-
-const orderData = ref<any>({});
-
-const visible = ref(false);
-
-const showKeyboard = ref(false);
+const orderData = ref<any>([]);

 const isLoading = ref(false);

-const visible2 = ref(false);
-
 const opt = ref<any>({});

 Taro.useLoad(e => {
@@ -138,23 +120,24 @@ Taro.useLoad(e => {
  getData(oid, bid, OrderType);
 });

-const a = ref(0);
-const b = ref(0);
+// const a = ref(0);
+// const b = ref(0);

 const payList = ref<any>([]);

 const get_pay_list = async () => {
  const res = await getPayList({});
-  // console.log(res);
  payList.value = res.data.data || [];
+  payVal.value = payList.value[0].ID;
 };

 const getData = async (oid: string, bid: string, OrderType: number) => {
-  const user_info = Taro.getStorageSync('userInfo');
-  const data = await getUserPoint({
-    phone: user_info.data.phone,
-    bid,
-  });
+  // const user_info = Taro.getStorageSync('userInfo');
+  // const data = await getUserPoint({
+  //   phone: user_info.data.phone,
+  //   bid,
+  // });
+
  const res = await getActiveOrderDetail({
    oid,
    OrderType: Number(OrderType),
@@ -163,47 +146,39 @@ const getData = async (oid: string, bid: string, OrderType: number) => {
  // let a = 0;
  // let b = 0;

-  orderData.value = {
-    ...res.data.data[0],
-    ...data.data,
-  };
+  // orderData.value = {
+  //   ...res.data.data[0],
+  //   ...data.data,
+  // };

-  a.value = 0;
-  b.value = 0;
+  orderData.value = res.data.data || [];

-  res.data.data.forEach(item => {
-    a.value += item.price;
-    b.value += item.exchange;
-  });
+  // console.log(orderData.value)

-  // console.log(orderData.value);
-  if (!orderData.value.oid)
+  // a.value = 0;
+  // b.value = 0;
+
+  // res.data.data.forEach(item => {
+  //   a.value += item.price;
+  //   b.value += item.discount_integral;
+  // });
+
+  if (!orderData.value.length)
    return Taro.showToast({
      title: '未获取到订单信息~',
      icon: 'none',
    });
-  countdownTime();
+  // countdownTime();
 };

 const pay = async () => {
  try {
+    if (isLoading.value) return;
    isLoading.value = true;
    if (!payVal.value)
      return Taro.showToast({ title: '请选择支付方式', icon: 'none' });
-    if (payVal.value !== 1) {
-      const res = await isCheckTradePwd();
-      if (res.data.pay_password) {
-        visible.value = true;
-        showKeyboard.value = true;
-      } else {
-        isLoading.value = false;
-        visible2.value = true;
-      }
-    } else {
    await confirmPay();
-    }
  } catch (error) {
-    isLoading.value = false;
    Taro.showToast({
      title: error.msg,
      icon: 'none',
@@ -211,36 +186,19 @@ const pay = async () => {
  }
 };

-const shortComplete = async value => {
-  try {
-    await checkTradePwd({
-      pay_password: value,
-    });
-    shortClose(false);
-    await confirmPay();
-  } catch (error) {
-    error_msg.value = error.msg;
-    shortVal.value = '';
-  }
-};
-
 const confirmPay = async () => {
  try {
-    const res = await payOrder({
-      // oid: opt.value.oid.map(item => item.oid),
+    const { data: res } = await payOrder({
      oid: opt.value.oid,
      OrderType: payVal.value,
      PayType: payVal.value,
    });
-    switch (payVal.value) {
-      case 1:
-        if (typeof res.data.data === 'object') {
    Taro.requestPayment({
-            timeStamp: res.data.data.timeStamp,
-            nonceStr: res.data.data.nonceStr,
-            package: res.data.data.package,
-            signType: res.data.data.signType,
-            paySign: res.data.data.paySign,
+      timeStamp: res.data.timeStamp,
+      nonceStr: res.data.nonceStr,
+      package: res.data.package,
+      signType: res.data.signType,
+      paySign: res.data.paySign,
      success: function () {
        Taro.showToast({
          title: '支付成功',
@@ -254,53 +212,21 @@ const confirmPay = async () => {
        });
      },
      complete: function () {
-              // Taro.redirectTo({
-              //   url: `/pages/users/order_list_detail/index?orderId=${opt.value.oid}&OrderType=1`,
-              // });
-              Taro.redirectTo({
-                url: `/pages/users/order_list/index?type=0`,
-              });
-            },
-          });
-        } else {
-          Taro.showToast({
-            title: '参数获取失败，请重试~',
-            icon: 'none',
-          });
-        }
-        break;
-      default:
-        Taro.showToast({
-          title: res.msg,
-          icon: 'none',
-        });
        setTimeout(() => {
-          // Taro.redirectTo({
-          //   url: `/pages/users/order_list_detail/index?orderId=${opt.value.oid}&OrderType=1`,
-          // });
-          Taro.redirectTo({
+          Taro.reLaunch({
            url: `/pages/users/order_list/index?type=0`,
          });
        }, 2000);
-        break;
-    }
-    isLoading.value = false;
+      },
+    });
  } catch (err) {
-    isLoading.value = false;
    Taro.showToast({
      title: err.msg,
      icon: 'none',
    });
-  }
-};
-
-const shortClose = (isMsg: boolean = true) => {
-  showKeyboard.value = false;
-  visible.value = false;
+  } finally {
    isLoading.value = false;
-  shortVal.value = '';
-  error_msg.value = '';
-  if (isMsg) Taro.showToast({title: '支付取消', icon: 'none'});
+  }
 };

 const cellClick = (val: number) => {
@@ -317,12 +243,6 @@ const countdownTime = () => {
  }, 1000);
 };

-const onTips = () => {
-  Taro.redirectTo({
-    url: '/pages/users/pwd/index',
-  });
-};
-
 Taro.useDidHide(() => {
  clearInterval(t_id.value);
 });
--- a/src/pages/hotGoods/hot_list/index.vue
+++ b/src/pages/hotGoods/hot_list/index.vue
@@ -189,7 +189,9 @@ const delOrder = async (oid: string) => {
        @click="tabChange(item.value)">
        <view class="text">{{ item.title }}</view>
        <view>{{ item.num }}</view>
-        <view class="line" :class="{lineColor: item.value === tabValue}"></view>
+        <view
+          class="line"
+          :class="{ lineColor: item.value === tabValue }"></view>
      </view>
    </view>
    <view v-if="orderList.length > 0">
--- a/src/pages/hotGoods/index/index.vue
+++ b/src/pages/hotGoods/index/index.vue
@@ -5,7 +5,7 @@
      <view class="item">
        <view @click="hotGoodsDetail">
          <IconFont
-            name="http://article.biliimg.com/bfs/article/131eda0add8662808d97ffb1191d19bf3e420647.png"
+            name="https://article.biliimg.com/bfs/article/131eda0add8662808d97ffb1191d19bf3e420647.png"
            size="40" />
          <view>我的订单</view>
        </view>
@@ -44,10 +44,10 @@
    <view class="goodBox">
      <view
        class="good"
-        v-for="item in (merdata as any)"
+        v-for="item in merdata as any"
        :key="item.ID"
        @click.stop="toMerDetails(item)">
-        <image :src="(item.head_photo as string)" />
+        <image :src="item.head_photo as string" />
        <view class="good-text-box">
          <text class="good-text">{{ item.name }}</text>
          <text style="color: #999"
@@ -129,7 +129,7 @@ const get_mer_list = async () => {
 const toMerDetails = (item: any) => {
  Taro.setStorageSync('mer_info', item);
  Taro.navigateTo({
-    url: `/pages/mer/mer_detail/index`,
+    url: `/pages/mer/mer_detail/index?bid=${item.bid}`,
  });
 };
 </script>
--- a/src/pages/index/components/HomeNew.vue
+++ b/src/pages/index/components/HomeNew.vue
@@ -0,0 +1,877 @@
+<template>
+  <view class="home-new">
+    <!-- Header & Search -->
+    <view class="header-fixed">
+      <view :style="{ paddingTop: statusBarHeight + 'px' }"></view>
+      <view class="header-content">
+        <!-- Location -->
+        <view class="location-bar">
+          <view class="location-inner" @click="getUserLocal">
+            <view class="iconfont icon-dizhi location-icon"></view>
+            <text class="location-text">{{ address }}</text>
+            <view class="iconfont icon-xiangxia location-arrow"></view>
+          </view>
+        </view>
+
+        <!-- Search Bar -->
+        <view class="search-container">
+          <input
+            type="text"
+            placeholder="请输入商家名称搜索"
+            class="search-input"
+            v-model="searchVal" />
+          <view class="search-icon-left">
+            <view class="iconfont icon-sousuo"></view>
+          </view>
+          <view class="search-btn" @click.stop="clickSearch">搜索</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- Main Content -->
+    <view class="main-content">
+      <!-- Banner / Hero -->
+      <view class="banner-hero">
+        <!-- Background Pattern Decoration -->
+        <view class="banner-decoration banner-decoration-top"></view>
+        <view class="banner-decoration banner-decoration-bottom"></view>
+
+        <view class="banner-inner">
+          <view class="banner-title">
+            玩赚积分<text class="banner-title-yellow">商城</text>
+          </view>
+          <view class="banner-subtitle-wrapper">
+            <view class="banner-divider"></view>
+            <text class="banner-subtitle">积分当钱花 · 兑换无上限</text>
+            <view class="banner-divider"></view>
+          </view>
+
+          <view class="banner-buttons">
+            <view class="banner-btn banner-btn-primary">
+              <text class="banner-btn-icon">💎</text> 积分兑换
+            </view>
+            <view class="banner-btn banner-btn-secondary">同城兑换</view>
+          </view>
+        </view>
+      </view>
+
+      <!-- Quick Actions Grid -->
+      <view class="nav-grid-wrapper">
+        <view class="nav-grid">
+          <view
+            class="nav-item"
+            v-for="(item, index) in navigationList"
+            :key="index"
+            @click="toPage(item)">
+            <view class="nav-icon-wrapper">
+              <image :src="item.icon" class="nav-icon" mode="aspectFit" />
+            </view>
+            <text class="nav-label">{{ item.name }}</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- Store List -->
+      <view class="store-section">
+        <view class="store-header">
+          <view class="store-header-line"></view>
+          附近商家
+        </view>
+
+        <view class="store-list">
+          <view
+            class="store-item"
+            v-for="(item, index) in merList"
+            :key="index"
+            @click="toMerDetails(item)">
+            <view class="store-image-wrapper">
+              <image
+                :src="item.head_photo"
+                class="store-image"
+                mode="aspectFill" />
+              <!-- <view class="store-badge" v-if="index < 3">严选</view> -->
+            </view>
+            <view class="store-info">
+              <view class="store-name">{{ item.name }}</view>
+              <view class="store-rating">
+                <view class="rating-stars">
+                  <text class="stars-text">★★★★★</text>
+                  <text class="rating-score">5.0分</text>
+                </view>
+                <text class="rating-divider">|</text>
+                <text class="rating-sales">月售 1000+</text>
+              </view>
+              <view class="store-distance">
+                <text class="distance-placeholder">.</text>
+                <text class="distance-text">
+                  距离我{{
+                    calculateDistance(
+                      userLocalNum.t,
+                      userLocalNum.l,
+                      Number(item.lat),
+                      Number(item.lon),
+                    )
+                  }}
+                </text>
+              </view>
+            </view>
+          </view>
+
+          <!-- Empty State -->
+          <view v-if="merList.length === 0" class="store-empty">
+            暂无附近商家
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <Popup :imgArr="imgList" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import Taro from '@tarojs/taro';
+import { ref } from 'vue';
+import { getHomeList } from '@/api/home';
+import { getMerList } from '@/api/goods';
+import { bindParent } from '@/api/user';
+import { calculateDistance } from '@/utils';
+import Popup from '@/components/Popup.vue';
+
+const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight || 20;
+
+const address = ref('获取位置中...');
+const searchVal = ref('');
+const navigationList = ref<any[]>([]);
+const merList = ref<any[]>([]);
+const pageVal = ref({
+  page: 1,
+  total: 0,
+});
+const userLocalNum = ref({
+  l: 0,
+  t: 0,
+});
+
+const imgList = ref([require('../../../static/zhenggai.png')]);
+
+// Lifecycle
+Taro.useLoad(() => {
+  getPrivacy();
+  getUserLocal();
+  getNavLists();
+  checkBindParent();
+});
+
+Taro.useShareAppMessage(() => ({
+  title: '捷兑通',
+  path: `/pages/index/index?scene=${Taro.getStorageSync('token')}`,
+  imageUrl: 'https://upload.jdt168.com/1714375021923881119_Share.jpg',
+}));
+
+Taro.useReachBottom(() => {
+  if (merList.value.length >= pageVal.value.total) {
+    if (pageVal.value.total > 0) {
+      Taro.showToast({ title: '没有更多了', icon: 'none' });
+    }
+    return;
+  }
+  pageVal.value.page += 1;
+  fetchMerList();
+});
+
+// Methods
+const checkBindParent = async () => {
+  if (Taro.getStorageSync('token') && Taro.getStorageSync('bind_id')) {
+    try {
+      const res: any = await bindParent({
+        uid: Taro.getStorageSync('bind_id'),
+      });
+      Taro.showToast({
+        title: res.msg,
+      });
+      Taro.removeStorageSync('bind_id');
+    } catch (error) {
+      Taro.removeStorageSync('bind_id');
+    }
+  }
+};
+
+const getPrivacy = () => {
+  Taro.getPrivacySetting({
+    success: res => {
+      if (res.needAuthorization) {
+        Taro.requirePrivacyAuthorize({
+          success: () => console.log('用户同意授权'),
+          fail: () => {
+            console.log('用户拒绝授权');
+            // Taro.exitMiniProgram();
+          },
+        });
+      }
+    },
+  });
+};
+
+const getUserLocal = () => {
+  Taro.getLocation({
+    type: 'wgs84',
+    success: res => {
+      userLocalNum.value.l = res.longitude;
+      userLocalNum.value.t = res.latitude;
+      fetchAddress(res.latitude, res.longitude);
+      // Refresh list with location
+      pageVal.value.page = 1;
+      merList.value = [];
+      fetchMerList();
+    },
+    fail: () => {
+      address.value = '未能获取定位';
+      // Load list anyway
+      fetchMerList();
+    },
+  });
+};
+
+const fetchAddress = (lat, lon) => {
+  Taro.request({
+    url: `https://api.tianditu.gov.cn/geocoder?postStr={'lon':${lon},'lat':${lat},'ver':1}&type=geocode&tk=42db4f3dfd1a18d31e73ee90aa2ce054`,
+    method: 'GET',
+    success: res => {
+      const { msg, result } = res.data;
+      if (msg === 'ok') {
+        address.value = `${result.addressComponent.county}${result.addressComponent.town}${result.addressComponent.address}`;
+      }
+    },
+  });
+};
+
+const getNavLists = async () => {
+  const defaults = [
+    {
+      type: 1,
+      icon: '//p0.meituan.net/csc/f33ad2443a67e9f3474a1d5fd9d529db7504.png',
+      url: '/pages/users/settled_mer/index',
+      name: '商户入驻',
+    },
+    {
+      type: 1,
+      icon: '//p0.meituan.net/csc/0403cf37dd14a6b44b22ffccaa2878f95703.png',
+      url: '/pages/allClassList/index',
+      name: '全部服务',
+    },
+  ];
+
+  try {
+    const res = await getHomeList();
+    const apiList = res.data.data.map(item => ({
+      ID: item.ID,
+      type: 2,
+      icon: item.icon,
+      url: item.url,
+      name: item.name,
+    }));
+    navigationList.value = [...apiList, ...defaults];
+  } catch (e) {
+    console.error(e);
+    navigationList.value = defaults;
+  }
+};
+
+const fetchMerList = async () => {
+  try {
+    const res = await getMerList({
+      PageNum: pageVal.value.page,
+      PageSize: 10,
+      // class_id: 0
+    });
+    pageVal.value.total = res.data.total;
+    if (res.data.data) {
+      merList.value.push(...res.data.data);
+    }
+  } catch (e) {
+    console.error(e);
+  }
+};
+
+const clickSearch = () => {
+  if (!searchVal.value)
+    return Taro.showToast({ title: '请输入商家名称', icon: 'none' });
+  Taro.navigateTo({ url: `/pages/search/index?name=${searchVal.value}` });
+  searchVal.value = '';
+};
+
+const toPage = item => {
+  item.type !== 1
+    ? Taro.navigateTo({
+        url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
+      })
+    : Taro.navigateTo({ url: item.url });
+};
+
+const toMerDetails = item => {
+  Taro.navigateTo({ url: `/pages/mer/mer_detail/index?bid=${item.bid}` });
+};
+</script>
+
+<style lang="scss">
+/* 所有新版样式包裹在 .home-new 作用域下 */
+.home-new {
+  background-color: #f5f6f7;
+  min-height: 100vh;
+  /* Header Styles */
+  .header-fixed {
+    position: sticky;
+    top: 0;
+    z-index: 50;
+    background: linear-gradient(180deg, #eff6ff 0%, #f5f6f7 100%);
+  }
+
+  .header-content {
+    padding: 10px 20px 10px;
+  }
+
+  .location-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    font-size: 22px;
+    color: #6b7280;
+  }
+
+  .location-inner {
+    display: flex;
+    align-items: center;
+    max-width: 90%;
+    background-color: rgba(255, 255, 255, 0.6);
+    padding: 8px 16px;
+    border-radius: 50px;
+    backdrop-filter: blur(10px);
+  }
+
+  .location-icon {
+    width: 26px;
+    height: 26px;
+    margin-right: 8px;
+    color: #374151;
+  }
+
+  .location-text {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-weight: 500;
+  }
+
+  .location-arrow {
+    width: 20px;
+    height: 20px;
+    margin-left: 8px;
+    color: #9ca3af;
+  }
+
+  .search-container {
+    position: relative;
+    // margin: 10px auto;
+    margin-top: 20px;
+  }
+
+  .search-input {
+    height: 70px;
+    background-color: #ffffff;
+    border: none;
+    border-radius: 20px;
+    padding: 10px 20px 10px 70px;
+    font-size: 28px;
+  }
+
+  .search-icon-left {
+    position: absolute;
+    left: 20px;
+    top: 50%;
+    transform: translateY(-50%);
+    color: #9ca3af;
+    font-size: 30px;
+  }
+
+  .search-btn {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    transform: translateY(-50%);
+    background: linear-gradient(90deg, #fa2c19 0%, #ff5d45 100%);
+    color: #ffffff;
+    font-size: 24px;
+    font-weight: bold;
+    padding: 12px 30px;
+    border-radius: 16px;
+    box-shadow: 0 4px 6px rgba(250, 44, 25, 0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+  }
+
+  /* Main Content */
+  .main-content {
+    padding: 0 20px 180px;
+  }
+
+  /* Banner Hero */
+  .banner-hero {
+    position: relative;
+    border-radius: 20px;
+    overflow: hidden;
+    background: linear-gradient(135deg, #60a5fa 0%, #3b82f6 100%);
+    height: 280px;
+    margin-top: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
+
+  .banner-decoration {
+    position: absolute;
+    border-radius: 50%;
+    opacity: 0.1;
+  }
+
+  .banner-decoration-top {
+    top: -80px;
+    right: -80px;
+    width: 240px;
+    height: 240px;
+    background-color: rgba(255, 255, 255, 0.3);
+  }
+
+  .banner-decoration-bottom {
+    bottom: -60px;
+    left: -60px;
+    width: 180px;
+    height: 180px;
+    background-color: rgba(147, 197, 253, 0.3);
+  }
+
+  .banner-inner {
+    position: relative;
+    // height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    padding: 30px;
+  }
+
+  .banner-title {
+    font-size: 60px;
+    font-weight: 900;
+    color: #ffffff;
+    letter-spacing: 4px;
+    font-style: italic;
+    margin-bottom: 8px;
+  }
+
+  .banner-title-yellow {
+    color: #fde047;
+  }
+
+  .banner-subtitle-wrapper {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin-bottom: 30px;
+    opacity: 0.95;
+  }
+
+  .banner-divider {
+    width: 60px;
+    height: 1px;
+    background-color: rgba(255, 255, 255, 0.5);
+  }
+
+  .banner-subtitle {
+    color: #ffffff;
+    font-size: 22px;
+    font-weight: 500;
+    letter-spacing: 2px;
+  }
+
+  .banner-buttons {
+    display: flex;
+    width: 100%;
+    max-width: 600px;
+    gap: 20px;
+  }
+
+  .banner-btn {
+    flex: 1;
+    border-radius: 50px;
+    padding: 15px 0;
+    font-size: 26px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    pointer-events: none;
+    transform: scale(0.9);
+  }
+
+  .banner-btn-primary {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #ffffff;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    backdrop-filter: blur(10px);
+  }
+
+  .banner-btn-secondary {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: rgba(255, 255, 255, 0.8);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    backdrop-filter: blur(10px);
+  }
+
+  .banner-btn-icon {
+    font-size: 36px;
+    opacity: 0.8;
+  }
+
+  /* Navigation Grid */
+  .nav-grid-wrapper {
+    background-color: #ffffff;
+    border-radius: 20px;
+    padding: 30px;
+    margin-top: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
+
+  .nav-grid {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 20px;
+  }
+
+  .nav-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 10px;
+  }
+
+  .nav-icon-wrapper {
+    width: 88px;
+    height: 88px;
+    border-radius: 50%;
+    background-color: #f9fafb;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+  }
+
+  .nav-icon {
+    width: 60px;
+    height: 60px;
+  }
+
+  .nav-label {
+    font-size: 22px;
+    font-weight: 500;
+    color: #374151;
+    text-align: center;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  /* Featured Section */
+  .featured-section {
+    display: flex;
+    gap: 20px;
+    height: 280px;
+    margin-top: 20px;
+  }
+
+  .featured-card {
+    background-color: #ffffff;
+    border-radius: 20px;
+    overflow: hidden;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+    position: relative;
+  }
+
+  .featured-card-left {
+    flex: 1.2;
+    background: linear-gradient(135deg, #fff7ed 0%, #ffffff 100%);
+    border: 1px solid #fed7aa;
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .featured-content {
+    position: relative;
+    z-index: 10;
+  }
+
+  .featured-title {
+    font-size: 30px;
+    font-weight: bold;
+    color: #1f2937;
+  }
+
+  .featured-desc {
+    font-size: 20px;
+    color: #f97316;
+    margin-top: 4px;
+  }
+
+  .featured-btn {
+    margin-top: 20px;
+    background: linear-gradient(90deg, #f97316 0%, #ef4444 100%);
+    color: #ffffff;
+    font-size: 22px;
+    font-weight: bold;
+    padding: 10px 20px;
+    border-radius: 50px;
+    border: none;
+    display: inline-block;
+    line-height: 1.5;
+    box-shadow: 0 2px 4px rgba(249, 115, 22, 0.3);
+  }
+
+  .featured-bg {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    opacity: 0.1;
+    pointer-events: none;
+  }
+
+  .featured-svg {
+    width: 180px;
+    height: 180px;
+    color: #ea580c;
+    transform: rotate(-12deg) translate(30px, 30px);
+  }
+
+  .featured-card-right {
+    flex: 1;
+    border: 1px solid #e5e7eb;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .featured-image {
+    height: 67%;
+    position: relative;
+  }
+
+  .featured-img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .featured-overlay {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: linear-gradient(
+      180deg,
+      transparent 0%,
+      rgba(0, 0, 0, 0.6) 100%
+    );
+    padding: 10px 15px;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+  }
+
+  .featured-overlay-title {
+    color: #ffffff;
+    font-weight: bold;
+    font-size: 26px;
+  }
+
+  .featured-footer {
+    height: 33%;
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #ffffff;
+  }
+
+  .featured-footer-left {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .featured-footer-title {
+    font-size: 22px;
+    font-weight: bold;
+    color: #1f2937;
+  }
+
+  .featured-footer-arrow {
+    width: 44px;
+    height: 44px;
+    border-radius: 50%;
+    background-color: #eff6ff;
+    color: #3b82f6;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24px;
+  }
+
+  /* Store Section */
+  .store-section {
+    padding-bottom: 20px;
+    margin-top: 20px;
+  }
+
+  .store-header {
+    font-size: 30px;
+    font-weight: bold;
+    color: #1f2937;
+    padding: 0 8px 15px;
+    display: flex;
+    align-items: center;
+  }
+
+  .store-header-line {
+    width: 6px;
+    height: 30px;
+    background-color: #fa2c19;
+    border-radius: 50px;
+    margin-right: 15px;
+  }
+
+  .store-list {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+  }
+
+  .store-item {
+    background-color: #ffffff;
+    border-radius: 20px;
+    padding: 15px;
+    display: flex;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+    border: 1px solid #f9fafb;
+  }
+
+  .store-image-wrapper {
+    width: 180px;
+    height: 180px;
+    flex-shrink: 0;
+    background-color: #f3f4f6;
+    border-radius: 16px;
+    overflow: hidden;
+    position: relative;
+  }
+
+  .store-image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .store-badge {
+    position: absolute;
+    top: 0;
+    left: 0;
+    background-color: #eab308;
+    color: #ffffff;
+    font-size: 20px;
+    padding: 4px 12px;
+    border-bottom-right-radius: 16px;
+    font-weight: bold;
+  }
+
+  .store-info {
+    margin-left: 20px;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    height: 180px;
+    justify-content: space-between;
+    padding: 8px 0;
+  }
+
+  .store-name {
+    font-weight: bold;
+    color: #1f2937;
+    font-size: 30px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: 1.2;
+  }
+
+  .store-rating {
+    display: flex;
+    align-items: center;
+    font-size: 22px;
+    margin-top: 4px;
+  }
+
+  .rating-stars {
+    display: flex;
+    align-items: center;
+    margin-right: 15px;
+  }
+
+  .stars-text {
+    color: #fbbf24;
+    font-size: 20px;
+    margin-right: 8px;
+  }
+
+  .rating-score {
+    color: #fa2c19;
+    font-weight: bold;
+  }
+
+  .rating-divider {
+    color: #d1d5db;
+    margin: 0 10px;
+  }
+
+  .rating-sales {
+    color: #6b7280;
+  }
+
+  .store-distance {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .distance-placeholder {
+    font-size: 22px;
+    color: transparent;
+    user-select: none;
+  }
+
+  .distance-text {
+    font-size: 22px;
+    color: #9ca3af;
+  }
+
+  .store-empty {
+    text-align: center;
+    padding: 80px 0;
+    color: #9ca3af;
+    font-size: 26px;
+  }
+
+  .iconfont {
+    font-size: inherit;
+  }
+} /* .home-new 作用域结束 */
+</style>
--- a/src/pages/index/components/HomeOld.vue
+++ b/src/pages/index/components/HomeOld.vue
@@ -0,0 +1,366 @@
+<template>
+  <view class="home-old">
+    <view :style="{ marginTop: BarHeight + 'px' }"></view>
+    <view class="local">
+      <view class="iconfont icon-dizhi" style="font-size: 20px"></view>
+      <text class="text-[28px]">{{ address }}</text>
+    </view>
+    <view class="search">
+      <view
+        class="iconfont icon-sousuo"
+        style="color: #8f8f8f; margin-right: 8px"></view>
+      <input placeholder="请输入商家名称搜索" v-model="searchVal" />
+      <view class="search-btn" @click="clickSearch">搜索</view>
+    </view>
+    <view class="banner">
+      <!-- <view
+        class="title"
+        :style="{
+          backgroundImage: `url('${titleImgPath}')`,
+        }"></view> -->
+      <image class="title" :src="titleImgPath"></image>
+      <view class="jf-btn" hover-class="none"></view>
+      <!-- <view class="footer">
+        <navigator
+          hover-class="none"
+          class="btn-1"
+          url="/pages/fastBuy/index?type=1"></navigator>
+        <navigator
+          hover-class="none"
+          openType="switchTab"
+          url="/pages/game/gamehome/index"
+          class="btn-2"></navigator>
+        <navigator
+          hover-class="none"
+          class="btn-3"
+          url="/pages/fastBuy/index?type=2"></navigator>
+      </view> -->
+    </view>
+    <view class="navigation">
+      <view
+        class="item"
+        v-for="(item, index) in navigationList"
+        :key="index"
+        @click="toPage(item)">
+        <image class="icon" :src="item.icon" />
+        <view class="text">{{ item.name }}</view>
+      </view>
+    </view>
+    <!-- <navigator
+      class="ad"
+      url="/pages/marketing/yq/index"
+      open-type="navigate"
+      hover-class="none">
+    </navigator> -->
+    <MerList :get-user-location="getUserLocal" />
+    <Popup :imgArr="imgList" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import Taro from '@tarojs/taro';
+import { ref } from 'vue';
+import { getHomeList } from '@/api/home';
+import { bindParent } from '@/api/user';
+import MerList from '@/components/MerList.vue';
+import Popup from '@/components/Popup.vue';
+
+const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
+const BarHeight = ref((statusBarHeight as number) + 7);
+
+const titleImgPath = require(process.env.TARO_APP_TITLE_IMG as string);
+
+interface navigationType {
+  ID?: number;
+  type: number;
+  icon: string;
+  name: string;
+  url: string;
+}
+
+const navigationList = ref<Array<navigationType>>([]);
+
+const imgList = ref([
+  // require('../../static/popTip-1.png'),
+  // require('../../static/popTip.png'),
+  require('../../../static/zhenggai.png'),
+]);
+
+Taro.useShareAppMessage(() => ({
+  title: '捷兑通',
+  path: `/pages/index/index?scene=${Taro.getStorageSync('token')}`,
+  imageUrl: 'https://upload.jdt168.com/1714375021923881119_Share.jpg',
+}));
+
+const searchVal = ref('');
+
+const clickSearch = () => {
+  if (!searchVal.value)
+    return Taro.showToast({
+      title: '请输入商家名称再搜索',
+      icon: 'none',
+    });
+  Taro.navigateTo({
+    url: `/pages/search/index?name=${searchVal.value}`,
+  });
+  searchVal.value = '';
+};
+
+Taro.useLoad(() => {
+  Taro.getPrivacySetting({
+    success: res => {
+      if (res.needAuthorization) {
+        Taro.requirePrivacyAuthorize({
+          success: () => {
+            console.log('用户同意授权');
+          },
+          fail: () => {
+            console.log('用户拒绝授权');
+            Taro.exitMiniProgram();
+          },
+        });
+      }
+    },
+  });
+  getNavLists();
+  getUserLocal();
+  checkBindParent();
+});
+
+const checkBindParent = async () => {
+  if (Taro.getStorageSync('token') && Taro.getStorageSync('bind_id')) {
+    try {
+      const res: any = await bindParent({
+        uid: Taro.getStorageSync('bind_id'),
+      });
+      Taro.showToast({
+        title: res.msg,
+      });
+      Taro.removeStorageSync('bind_id');
+    } catch (error) {
+      Taro.removeStorageSync('bind_id');
+    }
+  }
+};
+
+const address = ref('获取位置中......');
+
+const getUserLocal = async () => {
+  Taro.getLocation({
+    type: 'wgs84',
+    success: res => {
+      // Taro.request({
+      //   url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=4EJBZ-TZXCV-IHUPX-UMI2L-MK3N3-37FSQ&get_poi=1`,
+      //   method: 'GET',
+      //   success: res => {
+      //     switch (res.data.status) {
+      //       case 121:
+      //         Taro.showToast({
+      //           title: res.data.message,
+      //           icon: 'none',
+      //         });
+      //         break;
+      //       default:
+      //         const data = res.data.result.address_component;
+      //         address.value = `${data.district}${data.street_number}`;
+      //         break;
+      //     }
+      //   },
+      // });
+      Taro.request({
+        url: `https://api.tianditu.gov.cn/geocoder?postStr={'lon':${res.longitude},'lat':${res.latitude},'ver':1}&type=geocode&tk=42db4f3dfd1a18d31e73ee90aa2ce054`,
+        method: 'GET',
+        success: res => {
+          const { msg, result } = res.data;
+          if (msg === 'ok') {
+            address.value = `${result.addressComponent.county}${result.addressComponent.town}${result.addressComponent.address}`;
+          } else {
+            Taro.showToast({
+              title: msg,
+              icon: 'none',
+            });
+          }
+        },
+      });
+    },
+  });
+};
+
+const getNavLists = async () => {
+  navigationList.value = [
+    // {
+    //   type: 1,
+    //   icon: '//p0.meituan.net/csc/5c770748f0028c63741c5ec14df3cc386715.png',
+    //   url: '',
+    //   name: '活动商家',
+    // },
+    // {
+    //   type: 1,
+    //   icon: '//p0.meituan.net/csc/4868c06b99008ff7d5f81e6514858c8a7950.png',
+    //   url: '',
+    //   name: '兑换商家',
+    // },
+    {
+      type: 1,
+      icon: '//p0.meituan.net/csc/f33ad2443a67e9f3474a1d5fd9d529db7504.png',
+      url: '/pages/users/settled_mer/index',
+      name: '商户入驻',
+    },
+    {
+      type: 1,
+      icon: '//p0.meituan.net/csc/0403cf37dd14a6b44b22ffccaa2878f95703.png',
+      url: '/pages/allClassList/index',
+      name: '全部服务',
+    },
+  ];
+  const res = await getHomeList();
+  res.data.data.forEach(item => {
+    navigationList.value.unshift({
+      ID: item.ID,
+      type: 2,
+      icon: item.icon,
+      url: item.url,
+      name: item.name,
+    });
+  });
+};
+
+const toPage = item => {
+  item.type !== 1
+    ? Taro.navigateTo({
+        url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
+      })
+    : Taro.navigateTo({
+        url: item.url as string,
+      });
+};
+</script>
+
+<style lang="scss">
+/* 旧版样式 - 所有样式包裹在 .home-old 作用域下 */
+page {
+  background-image: url('//p0.meituan.net/csc/aaaccd28594119e4b838d07d30739471440261.png');
+  background-size: 100% 57%;
+  background-repeat: no-repeat;
+  box-sizing: border-box;
+  min-height: 100vh;
+}
+.home-old {
+  .local {
+    margin-left: 15px;
+    display: flex;
+    align-items: flex-end;
+    color: #fff;
+  }
+
+  .search {
+    margin: 30px auto;
+    display: flex;
+    border-radius: 18px;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 15px;
+    background: rgba(255, 255, 255, 0.8);
+    width: 730px;
+
+    input {
+      flex: 1;
+    }
+
+    .search-btn {
+      background-color: #f83d3d;
+      color: #fff;
+      border-radius: 10px;
+      width: 100px;
+      height: 60px;
+      text-align: center;
+      line-height: 60px;
+    }
+  }
+
+  .banner {
+    position: relative;
+    text-align: center;
+    .title {
+      width: 600px;
+      height: 90px;
+      left: 50%;
+    }
+
+    .jf-btn {
+      margin: 15px auto;
+      background-image: url('//p1.meituan.net/csc/e125184432dc591137c24a26abe5796a25262.png');
+      background-size: 100% 100%;
+      width: 350px;
+      height: 70px;
+    }
+
+    .footer {
+      display: flex;
+      align-items: flex-end;
+      justify-content: space-between;
+      margin: 0 auto;
+      padding: 0 15px;
+
+      .btn-1 {
+        background-image: url('//p0.meituan.net/csc/7708348ee250eae910328bb7c12197f029562.png');
+        background-size: 100% 100%;
+        width: 200px;
+        height: 220px;
+      }
+
+      .btn-2 {
+        // background-image: url('//p1.meituan.net/csc/8cc2b518031eb7424b184d90a583d805146287.png');
+        background-image: url('../../../static/game_banner.png');
+        background-size: 100% 100%;
+        width: 300px;
+        height: 220px;
+      }
+
+      .btn-3 {
+        background-image: url('//p0.meituan.net/csc/31bd1f5c791c95557758dfa5c96e001529545.png');
+        background-size: 100% 100%;
+        width: 200px;
+        height: 220px;
+      }
+    }
+  }
+
+  .navigation {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    grid-gap: 40px;
+    margin: 20px;
+    height: auto;
+    background-color: #fff;
+    border-radius: 20px;
+    padding: 32px 0;
+
+    .item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .icon {
+        background-size: 100% 100%;
+        width: 90px;
+        height: 90px;
+      }
+
+      .text {
+        color: #333333;
+        font-size: 26px;
+        margin-top: 6px;
+      }
+    }
+  }
+
+  .ad {
+    // background-image: url('https://jdt168.oss-cn-guangzhou.aliyuncs.com/ad.png');
+    background-image: url('https://pic.imgdb.cn/item/6697aa0dd9c307b7e95c94d9.png');
+    background-size: 100% 100%;
+    height: 180px;
+    margin: 20px;
+  }
+}
+</style>
--- a/src/pages/index/index.scss
+++ b/src/pages/index/index.scss
@@ -1,123 +0,0 @@
-page {
-  background-image: url('//p0.meituan.net/csc/aaaccd28594119e4b838d07d30739471440261.png');
-  background-size: 100% 57%;
-  background-repeat: no-repeat;
-  box-sizing: border-box;
-}
-
-.local {
-  margin-left: 15px;
-  display: flex;
-  align-items: flex-end;
-  color: #fff;
-}
-
-.search {
-  margin: 30px auto;
-  display: flex;
-  border-radius: 18px;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 15px;
-  background: rgba(255, 255, 255, 0.8);
-  width: 730px;
-
-  input {
-    flex: 1;
-  }
-
-  .search-btn {
-    background-color: #f83d3d;
-    color: #fff;
-    border-radius: 10px;
-    width: 100px;
-    height: 60px;
-    text-align: center;
-    line-height: 60px;
-  }
-}
-
-.banner {
-  .title {
-    background-image: url('//p0.meituan.net/csc/542112fc072d4687b437848bc29b0a1730495.png');
-    background-size: 100% 100%;
-    width: 600px;
-    height: 90px;
-    margin: auto;
-  }
-
-  .jf-btn {
-    margin: 15px auto;
-    background-image: url('//p1.meituan.net/csc/e125184432dc591137c24a26abe5796a25262.png');
-    background-size: 100% 100%;
-    width: 350px;
-    height: 70px;
-  }
-
-  .footer {
-    display: flex;
-    align-items: flex-end;
-    justify-content: space-between;
-    margin: 0 auto;
-    padding: 0 15px;
-
-    .btn-1 {
-      background-image: url('//p0.meituan.net/csc/7708348ee250eae910328bb7c12197f029562.png');
-      background-size: 100% 100%;
-      width: 200px;
-      height: 220px;
-    }
-
-    .btn-2 {
-      // background-image: url('//p1.meituan.net/csc/8cc2b518031eb7424b184d90a583d805146287.png');
-      background-image: url('../../static/game_banner.png');
-      background-size: 100% 100%;
-      width: 300px;
-      height: 220px;
-    }
-
-    .btn-3 {
-      background-image: url('//p0.meituan.net/csc/31bd1f5c791c95557758dfa5c96e001529545.png');
-      background-size: 100% 100%;
-      width: 200px;
-      height: 220px;
-    }
-  }
-}
-
-.navigation {
-  display: grid;
-  grid-template-columns: repeat(4, 1fr);
-  grid-gap: 40px;
-  margin: 20px;
-  height: auto;
-  background-color: #fff;
-  border-radius: 20px;
-  padding: 32px 0;
-
-  .item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .icon {
-      background-size: 100% 100%;
-      width: 90px;
-      height: 90px;
-    }
-
-    .text {
-      color: #333333;
-      font-size: 26px;
-      margin-top: 6px;
-    }
-  }
-}
-
-.ad {
-  // background-image: url('https://jdt168.oss-cn-guangzhou.aliyuncs.com/ad.png');
-  background-image: url('https://pic.imgdb.cn/item/6697aa0dd9c307b7e95c94d9.png');
-  background-size: 100% 100%;
-  height: 180px;
-  margin: 20px;
-}
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,184 +1,14 @@
 <template>
-  <view>
-    <view :style="{marginTop: BarHeight + 'px'}"></view>
-    <view class="local">
-      <view class="iconfont icon-dizhi" style="font-size: 20px"></view>
-      <text class="text-[28px]">{{ address }}</text>
-    </view>
-    <view class="search">
-      <view
-        class="iconfont icon-sousuo"
-        style="color: #8f8f8f; margin-right: 8px"></view>
-      <input placeholder="请输入商家名称搜索" v-model="searchVal" />
-      <view class="search-btn" @click="clickSearch">搜索</view>
-    </view>
-    <view class="banner">
-      <view class="title"></view>
-      <navigator class="jf-btn" hover-class="none"></navigator>
-      <view class="footer">
-        <navigator
-          hover-class="none"
-          class="btn-1"
-          url="/pages/fastBuy/index?type=1"></navigator>
-        <navigator
-          hover-class="none"
-          openType="switchTab"
-          url="/pages/game/gamehome/index"
-          class="btn-2"></navigator>
-        <navigator
-          hover-class="none"
-          class="btn-3"
-          url="/pages/fastBuy/index?type=2"></navigator>
-      </view>
-    </view>
-    <view class="navigation">
-      <view
-        class="item"
-        v-for="(item, index) in navigationList"
-        :key="index"
-        @click="toPage(item)">
-        <image class="icon" :src="item.icon" />
-        <view class="text">{{ item.name }}</view>
-      </view>
-    </view>
-    <navigator
-      class="ad"
-      url="/pages/marketing/yq/index"
-      open-type="navigate"
-      hover-class="none">
-    </navigator>
-    <MerList :get-user-location="getUserLocal" />
-  </view>
+  <HomeNew v-if="isNewHome" />
+  <HomeOld v-else />
 </template>

 <script setup lang="ts">
-import Taro from '@tarojs/taro';
 import { ref } from 'vue';
-import {getHomeList, getStoreList} from '@/api/home';
-import MerList from '@/components/MerList.vue';
-import {showTips} from '@/utils';
+import HomeOld from './components/HomeOld.vue';
+import HomeNew from './components/HomeNew.vue';

-const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
-const BarHeight = ref((statusBarHeight as number) + 7);
-
-interface navigationType {
-  ID?: number;
-  type: number;
-  icon: string;
-  name: string;
-  url: string;
-}
-
-const navigationList = ref<Array<navigationType>>([]);
-
-Taro.useShareAppMessage(() => ({
-  title: '捷兑通',
-  path: `/pages/index/index?scene=${Taro.getStorageSync('token')}`,
-  imageUrl: 'https://upload.jdt168.com/1714375021923881119_Share.jpg',
-}));
-
-const searchVal = ref('');
-
-const clickSearch = () => {
-  if (!searchVal.value)
-    return Taro.showToast({
-      title: '请输入商家名称再搜索',
-      icon: 'none',
-    });
-  Taro.navigateTo({
-    url: `/pages/search/index?name=${searchVal.value}`,
-  });
-  searchVal.value = '';
-};
-
-Taro.useLoad(() => {
-  Taro.getPrivacySetting({
-    success: res => {
-      if (res.needAuthorization) {
-        Taro.requirePrivacyAuthorize({
-          success: () => {
-            console.log('用户同意授权');
-          },
-          fail: () => {
-            console.log('用户拒绝授权');
-            Taro.exitMiniProgram();
-          },
-        });
-      }
-    },
-  });
-  getNavLists();
-  getUserLocal();
-});
-
-const address = ref('获取位置中......');
-
-const getUserLocal = async () => {
-  Taro.getLocation({
-    type: 'wgs84',
-    success: res => {
-      Taro.request({
-        url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=S3GBZ-WR26O-IXNW2-SXBOD-LZXV6-WAFNO&get_poi=1`,
-        method: 'GET',
-        success: res => {
-          const data = res.data.result.address_component;
-          address.value = `${data.district}${data.street_number}`;
-        },
-      });
-    },
-  });
-};
-
-const getNavLists = async () => {
-  navigationList.value = [
-    // {
-    //   type: 1,
-    //   icon: '//p0.meituan.net/csc/5c770748f0028c63741c5ec14df3cc386715.png',
-    //   url: '',
-    //   name: '活动商家',
-    // },
-    // {
-    //   type: 1,
-    //   icon: '//p0.meituan.net/csc/4868c06b99008ff7d5f81e6514858c8a7950.png',
-    //   url: '',
-    //   name: '兑换商家',
-    // },
-    {
-      type: 1,
-      icon: '//p0.meituan.net/csc/f33ad2443a67e9f3474a1d5fd9d529db7504.png',
-      url: '/pages/users/settled_mer/index',
-      name: '商户入驻',
-    },
-    {
-      type: 1,
-      icon: '//p0.meituan.net/csc/0403cf37dd14a6b44b22ffccaa2878f95703.png',
-      url: '/pages/allClassList/index',
-      name: '全部服务',
-    },
-  ];
-  const res = await getHomeList();
-  res.data.data.forEach(item => {
-    navigationList.value.unshift({
-      ID: item.ID,
-      type: 2,
-      icon: item.icon,
-      url: item.url,
-      name: item.name,
-    });
-  });
-};
-
-const toPage = item => {
-  item.type !== 1
-    ? Taro.navigateTo({
-        url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
-      })
-    : Taro.navigateTo({
-        url: item.url as string,
-      });
-};
+const isNewHome = process.env.TARO_APP_SHOW_NEW_HOME === 'yes';
 </script>

-<style lang="scss">
-@import './index.scss';
-</style>
+<style lang="scss" scoped></style>
--- a/src/pages/mer/mer_detail/index.vue
+++ b/src/pages/mer/mer_detail/index.vue
@@ -27,10 +27,10 @@
          spacing="1"
          active-color="rgba(252, 207, 10, 1)"
          v-model="mer_info.rate" />
-        <view class="text-[#9E9E9E] text-[25px]">销量：10000</view>
+        <view class="text-[#9E9E9E] text-[25px]">销量：1000+</view>
        <view class="text-[#9E9E9E] text-[25px]"
-          >营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}</view
-        >
+          >营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
+        </view>
      </view>
      <view class="line"></view>
      <view class="bom">
@@ -54,12 +54,12 @@
          <view @click="clickMap">
            <image
              class="w-[50px] h-[50px]"
-              src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
+              src="https://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
          </view>
          <view @click="clickPhone">
            <image
              class="w-[50px] h-[50px]"
-              src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
+              src="https://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
          </view>
        </view>
      </view>
@@ -86,18 +86,22 @@
                <image :src="item.cover" lazy-load />
                <view class="right">
                  <view class="name">{{ item.name }}</view>
-                  <view class="stock text-[25px]">剩余:{{ item.stock }}</view>
                  <view class="bom">
-                    <view>
-                      <view class="price">
-                        <text style="font-size: 15px">{{ item.number }}元</text>
-                      </view>
                    <view class="price">
                      <text style="font-size: 15px"
-                          >{{ item.exchange }}积分</text
-                        >
+                        >{{ item.discount_price }}元
+                        <text style="font-size: 15px" v-if="item.exchange"
+                          >+{{ item.exchange }}积分
+                        </text>
+                      </text>
                    </view>
                  </view>
+                  <view class="bom">
+                    <view>
+                      <view class="stock text-[25px]"
+                        >剩余:{{ item.stock }}</view
+                      >
+                    </view>
                    <view class="flex items-center justify-between">
                      <view
                        v-if="item.cartNum > 0"
@@ -156,13 +160,13 @@ Taro.useLoad(opt => {
  bid.value = opt.bid;
 });

-Taro.useDidShow(opt => {
-  if (!Taro.getStorageSync('token')) {
-    Taro.navigateTo({
-      url: '/pages/users/login/index?isBack=1',
-    });
-    return;
-  }
+Taro.useDidShow(() => {
+  // if (!Taro.getStorageSync('token')) {
+  //   Taro.navigateTo({
+  //     url: '/pages/users/login/index?isBack=1',
+  //   });
+  //   return;
+  // }
  Taro.getLocation({
    type: 'wgs84',
    success: res => {
@@ -232,6 +236,7 @@ interface GoodsType {
  cover: string;
  name: string;
  number: number;
+  discount_price: number;
  stock: number;
  cartNum: number;
  exchange: number;
@@ -265,7 +270,7 @@ const get_good_list = async (id: number) => {

 const toGoodDetails = (id: string, type: number) => {
  Taro.navigateTo({
-    url: `/pages/goods/goods_detail/index?gid=${id}&type=${type}`,
+    url: `/pages/goods/goods_detail/index?gid=${id}&type=${type}&bid=${bid.value}`,
  });
 };

--- a/src/pages/search/index.vue
+++ b/src/pages/search/index.vue
@@ -25,10 +25,16 @@ onMounted(() => {
 </script>

 <template>
-  <view>
+  <view class="search-page">
    <MerList v-if="classId" v-model="classId" />
    <Storelist v-else v-model="name" />
  </view>
 </template>

-<style lang="scss"></style>
+<style lang="scss">
+.search-page {
+  min-height: 100vh;
+  background-color: #f5f6f7;
+  background-image: none;
+}
+</style>
--- a/src/pages/user/index.scss
+++ b/src/pages/user/index.scss
@@ -1,8 +1,8 @@
 .appUser {
  box-sizing: border-box;
-  background-color: #f8f8f8;
+  // background-color: #f8f8f8;
  height: 100%;
-  background-image: url('http://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
+  background-image: url('https://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
  background-size: 100% 500px;
  background-repeat: no-repeat;
  position: relative;
@@ -103,7 +103,7 @@
 }

 .user-acc {
-  background-image: url('http://p0.meituan.net/csc/a74c44a7af541f01efbcc6fb023e6e09132712.png');
+  background-image: url('https://p0.meituan.net/csc/a74c44a7af541f01efbcc6fb023e6e09132712.png');
  background-size: 100% 100%;
  background-repeat: no-repeat;
  width: 90%;
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -1,14 +1,14 @@
 <template>
  <view class="appUser">
    <view
+      :style="{ width: isLogin ? '100%' : '70%' }"
      class="user-center-card__header__transparent"
-      v-if="isLogin"
-      :style="{width: isLogin ? '100%' : '70%'}">
+      v-if="isLogin">
      <view
        class="user-center-card__header__avatar"
        @click="toPage('/pages/users/user_setting/index')">
        <nut-avatar size="large">
-          <img :src="userInfo.data?.avatarUrl" />
+          <img :src="userInfo.data?.avatarUrl" alt="" />
        </nut-avatar>
      </view>
      <view
@@ -34,7 +34,8 @@
      <view class="user-center-card__header__avatar">
        <nut-avatar size="large">
          <img
-            src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
+            src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
+            alt="" />
        </nut-avatar>
      </view>
      <view class="user-center-card__header__info">
@@ -72,7 +73,7 @@
          class="mt-[30px] flex flex-col items-center"
          @click="toOrderList(1)">
          <IconFont
-            name="http://p0.meituan.net/csc/9943f6c938fc0e310141a2b99d5bde6617483.png"
+            name="https://p0.meituan.net/csc/9943f6c938fc0e310141a2b99d5bde6617483.png"
            size="42" />
          <view class="mt-[15px] text-[25px] text-[#333333]">待付款</view>
        </view>
@@ -80,7 +81,7 @@
          class="mt-[30px] flex flex-col items-center"
          @click="toOrderList(2)">
          <IconFont
-            name="http://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
+            name="https://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
            size="42" />
          <view class="mt-[15px] text-[25px] text-[#333333]">待使用</view>
        </view>
@@ -88,7 +89,7 @@
          class="mt-[30px] flex flex-col items-center"
          @click="toOrderList(3)">
          <IconFont
-            name="http://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
+            name="https://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
            size="42" />
          <view class="mt-[15px] text-[25px] text-[#333333]">已使用</view>
        </view>
@@ -96,7 +97,7 @@
          class="mt-[30px] flex flex-col items-center"
          @click="toOrderList(4)">
          <IconFont
-            name="http://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
+            name="https://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
            size="42" />
          <view class="mt-[15px] text-[25px] text-[#333333]">已失效</view>
        </view>
@@ -135,7 +136,7 @@
          @click="toPage('/pages/admin/add_order/index')">
          <IconFont
            size="42"
-            name="http://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
+            name="https://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
          <view class="label">后结点单</view>
        </view>
        <view
@@ -144,7 +145,7 @@
          @click="toPage('/pages/admin/verify/index')">
          <IconFont
            size="42"
-            name="http://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
+            name="https://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
          <view class="label">订单核销</view>
        </view>
        <view
@@ -153,8 +154,8 @@
          @click="toPage('/pages/admin/order_manage/index')">
          <IconFont
            size="42"
-            name="http://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
-          <view class="label">订单统计</view>
+            name="https://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
+          <view class="label">订单管理</view>
        </view>
        <view
          v-if="userInfo.data.permission.tx"
@@ -162,16 +163,16 @@
          @click="toPage('/pages/admin/withdrawal/index')">
          <IconFont
            size="42"
-            name="http://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
-          <view class="label">收益提现</view>
+            name="https://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
+          <view class="label">余额提现</view>
        </view>
      </view>
    </view>

    <!--    版权    -->
-    <view class="text-[#999999] mt-5 text-[20px] text-center">
-      <view>鑫瓴科技版权所有</view>
-      <view>v4.0.0</view>
+    <view class="mt-5 text-[20px] text-center">
+      <view class="text-[#999999]">{{ copText }}</view>
+      <!-- <view>v4.0.0</view> -->
    </view>
    <!-- 登录 -->
    <Auth
@@ -186,13 +187,19 @@ import {ref} from 'vue';
 import { ArrowRight, IconFont } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
 import Auth from '@/components/Auth.vue';
-import {getPersonalInfo, getPhone, bindParent} from '@/api/user';
+import {
+  getPersonalInfo,
+  getPhone,
+  // bindParent
+} from '@/api/user';
 import { maskString } from '@/utils';

 const isShowLogin = ref(false);

 const isLogin = ref(false);

+const copText = process.env.TARO_APP_COP;
+
 interface UserInfo {
  data?: {
    nickName?: string;
@@ -231,15 +238,15 @@ const init_data = () => {
  }
 };

-const test = () => {
-  console.log(process.env.TARO_APP_ID);
-  Taro.openCustomerServiceChat({
-    corpId: 'wwb5dd953ca36043ef',
-    extInfo: {
-      url: 'https://work.weixin.qq.com/kfid/kfcb2b0420e94102346',
-    },
-  });
-};
+// const test = () => {
+//   console.log(process.env.TARO_APP_ID);
+//   Taro.openCustomerServiceChat({
+//     corpId: 'wwb5dd953ca36043ef',
+//     extInfo: {
+//       url: 'https://work.weixin.qq.com/kfid/kfcb2b0420e94102346',
+//     },
+//   });
+// };

 const cancelLogin = () => {
  isShowLogin.value = false;
@@ -284,39 +291,39 @@ const userMenuList = ref([
  {
    label: '账户明细',
    url: '/pages/users/account/index',
-    icon: 'http://p0.meituan.net/csc/104f787b7cc5582868be46ff52475ecf7084.png',
+    icon: 'https://p0.meituan.net/csc/104f787b7cc5582868be46ff52475ecf7084.png',
  },
  {
    label: '后结订单',
    url: '/pages/users/pending_order/index',
-    icon: 'http://p0.meituan.net/csc/68d3f1f1ea375897a2b918851199b6546322.png',
+    icon: 'https://p0.meituan.net/csc/68d3f1f1ea375897a2b918851199b6546322.png',
  },
  {
    label: '我的推广',
    url: '/pages/users/distribution/index',
-    icon: 'http://p0.meituan.net/csc/950814cc0ed1289f170e8612fab597cd5310.png',
+    icon: 'https://p0.meituan.net/csc/950814cc0ed1289f170e8612fab597cd5310.png',
  },
  {
    label: '联系客服',
    type: 333,
    url: '/pages/users/account/index',
-    icon: 'http://p0.meituan.net/csc/ddd4b6ff4271ec05ced60db0aee1e9548383.png',
+    icon: 'https://p0.meituan.net/csc/ddd4b6ff4271ec05ced60db0aee1e9548383.png',
  },
  {
    label: '设置',
    url: '/pages/users/setting/index',
-    icon: 'http://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png',
+    icon: 'https://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png',
  },
  {
    label: '关于我们',
    url: '',
-    icon: 'http://p0.meituan.net/csc/3e772eca05bd56104e8a0a5c6cffe56c7447.png',
+    icon: 'https://p0.meituan.net/csc/3e772eca05bd56104e8a0a5c6cffe56c7447.png',
  },
 ]);

 const clickLogin = () => {
  // isShowLogin.value = true
-  Taro.redirectTo({
+  Taro.navigateTo({
    url: '/pages/users/login/index',
  });
 };
@@ -327,28 +334,28 @@ const toPage = (url: string) => {
  });
 };

-const scanCode = () => {
-  Taro.scanCode({
-    onlyFromCamera: true,
-    scanType: ['qrCode'],
-    success: async data => {
-      try {
-        await bindParent({
-          uid: data.result,
-        });
-        Taro.showToast({
-          title: '绑定成功',
-          icon: 'none',
-        });
-      } catch (error) {
-        Taro.showToast({
-          title: error.msg,
-          icon: 'none',
-        });
-      }
-    },
-  });
-};
+// const scanCode = () => {
+//   Taro.scanCode({
+//     onlyFromCamera: true,
+//     scanType: ['qrCode'],
+//     success: async data => {
+//       try {
+//         await bindParent({
+//           uid: data.result,
+//         });
+//         Taro.showToast({
+//           title: '绑定成功',
+//           icon: 'none',
+//         });
+//       } catch (error) {
+//         Taro.showToast({
+//           title: error.msg,
+//           icon: 'none',
+//         });
+//       }
+//     },
+//   });
+// };
 </script>

 <style lang="scss">
--- a/src/pages/users/distribution/integral/index.vue
+++ b/src/pages/users/distribution/integral/index.vue
@@ -3,7 +3,7 @@
    <view v-if="data.length > 0">
      <view
        class="card-list"
-        v-for="(item, index) in (data as any[])"
+        v-for="(item, index) in data as any[]"
        :key="index">
        <view class="left">
          <view>昵称：{{ item.nick_name }}</view>
--- a/src/pages/users/distribution/userlist/index.vue
+++ b/src/pages/users/distribution/userlist/index.vue
@@ -3,7 +3,7 @@
    <view v-if="data.length > 0">
      <view
        class="card-list"
-        v-for="(item, index) in (data as any[])"
+        v-for="(item, index) in data as any[]"
        :key="index">
        <view class="left">
          <image :src="item.avatarUrl" />
--- a/src/pages/users/login/index.vue
+++ b/src/pages/users/login/index.vue
@@ -3,12 +3,33 @@ import Taro from '@tarojs/taro';
 import UserModal from '@/components/UserModal.vue';
 import { ref } from 'vue';
 import { getPhone, login, getPersonalInfo } from '@/api/user';
-import logoImg from '../../../static/logo.jpg';
+// import logoImg from '../../../static/logo.jpg';
+import { Left, Home } from '@nutui/icons-vue-taro';
+
+const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
+const BarHeight = ref((statusBarHeight as number) - 7);
+
+const appName = process.env.TARO_APP_NAME;
+
+const logoImg = require(process.env.TARO_APP_LOGO_IMG as string);
+// const logoImg = process.env.TARO_APP_LOGO_IMG;

 const isShow = ref(false);

 const val = ref(false);

+const returns = () => {
+  Taro.navigateBack({
+    delta: 1,
+  });
+};
+
+const goHome = () => {
+  Taro.switchTab({
+    url: '/pages/index/index',
+  });
+};
+
 const getCode = () => {
  if (!val.value)
    return Taro.showToast({
@@ -133,10 +154,16 @@ const clickText = (type: number, text: string) => {

 <template>
  <view class="wrapper">
+    <view class="head-wrapper" :style="{ top: BarHeight + 'px' }">
+      <view class="head-menu">
+        <!-- <Left class="iconfont" @click="returns" /> -->
+        <Home class="iconfont" @click="goHome" />
+      </view>
+    </view>
    <image src="../../../static/wechat_login.jpg" />
    <view class="logo">
-      <image :src="logoImg" />
-      <view>捷兑通</view>
+      <image :src="logoImg"></image>
+      <view>{{ appName }}</view>
    </view>
    <view class="center">
      <nut-button
@@ -227,4 +254,30 @@ page {
    display: flex;
  }
 }
+
+.head-wrapper {
+  z-index: 999;
+  display: flex;
+  align-items: center;
+  position: fixed;
+  left: 30px;
+  top: 0;
+  //height: 114px;
+}
+
+.head-menu {
+  display: flex;
+  align-items: center;
+  height: 54px;
+  width: 100px;
+  background: rgba(0, 0, 0, 0.25);
+  border-radius: 27px;
+
+  .iconfont {
+    flex: 1;
+    text-align: center;
+    color: #fff;
+    box-sizing: border-box;
+  }
+}
 </style>
--- a/src/pages/users/order_list/index.vue
+++ b/src/pages/users/order_list/index.vue
@@ -4,7 +4,6 @@ import Taro from '@tarojs/taro';
 import Pay from '@/components/Pay.vue';
 import { getActiveOrderList, deleteActiveOrder } from '@/api/goods';
 import { getOrderStatistics } from '@/api/order';
-import {getUserPoint} from '@/api/admin';
 import UQRCode from 'uqrcodejs';

 const tabValue = ref(0);
@@ -58,12 +57,16 @@ interface OrderList {
  price: number;
  joint_oid: string;
  bid: string;
+  discount_price: number;
+  discount_integral: number;
 }

 interface GoodsItem {
  Goods: {
    name: string;
    cover: string;
+    discount_price: number;
+    exchange: number;
  };
  ID: number;
  gid: string;
@@ -94,7 +97,11 @@ const getList = async () => {
    const res = await getActiveOrderList({
      status: tabValue.value,
    });
+    if (res.data.data.length >= 2) {
+      orderList.value = res.data.data.slice(0, 2);
+    } else {
      orderList.value = res.data.data;
+    }
  } catch (error) {
    Taro.showToast({
      title: error.msg,
@@ -169,35 +176,6 @@ const delOrder = async (oid: string) => {
  await getList();
 };

-const countInfo = ref<{
-  A?: number;
-  B?: number;
-  C?: number;
-  D?: number;
-  F?: number;
-  ExchangeTotal?: number;
-  PriceTotal?: number;
-}>({});
-
-const getTj = async () => {
-  try {
-    const res = await getOrderStatistics({
-      type: 2,
-    });
-    countInfo.value = res.data.data;
-    tabsList.value[0].num = countInfo.value.A || 0;
-    tabsList.value[1].num = countInfo.value.B || 0;
-    tabsList.value[2].num = countInfo.value.C || 0;
-    tabsList.value[3].num = countInfo.value.D || 0;
-    tabsList.value[4].num = countInfo.value.F || 0;
-  } catch (error) {
-    Taro.showToast({
-      title: error.msg,
-      icon: 'none',
-    });
-  }
-};
-
 const t_id = ref();

 const openCode = item => {
@@ -272,10 +250,12 @@ const closed = () => {
          :style="{
            color: tabValue === item.value ? '#000' : '#9C9C9C',
          }"
-          >{{ item.title }}</view
-        >
+          >{{ item.title }}
+        </view>
        <!-- <view>{{ item.num }}</view> -->
-        <view class="line" :class="{lineColor: item.value === tabValue}"></view>
+        <view
+          class="line"
+          :class="{ lineColor: item.value === tabValue }"></view>
      </view>
    </view>
    <view v-if="orderList.length > 0">
@@ -315,8 +295,12 @@ const closed = () => {
            <view class="flex flex-col justify-between flex-1">
              <view class="title">{{ itm.Goods?.name }}</view>
              <view class="text-[#F83D3D] mt-5">
-                <view>{{ itm.pay_price }}元</view>
-                <view>{{ itm.pay_integral }}积分</view>
+                <view
+                  >{{ itm.Goods.discount_price }}元
+                  <text v-if="itm.Goods.exchange > 0"
+                    >+{{ itm.Goods.exchange }}积分</text
+                  >
+                </view>
              </view>
            </view>
            <view class="right">
@@ -330,13 +314,13 @@ const closed = () => {
          v-if="item.status !== 0"
          style="text-align: right">
          <text class="text-[#9C9C9C] text-[28px]"
-            >共{{ item.count }}件商品</text
-          >
+            >共{{ item.count }}件商品
+          </text>
          <text class="text-[26px]"
-            >{{ item.status !== 0 ? '实' : '应' }}付款{{
-              item.pay_type === 1 ? '(元): ' : '(积分): '
-            }}{{ item.pay_type === 1 ? item.price : item.exchange }}</text
-          >
+            >{{ item.status !== 0 ? '实' : '应' }}付款:
+            {{ item.discount_price }} (元)
+            <text v-if="item.exchange > 0">积分抵扣: {{ item.exchange }}</text>
+          </text>
          <!-- <view class="line"></view> -->
        </view>
        <view class="btn">
--- a/src/pages/users/order_list_detail/index.vue
+++ b/src/pages/users/order_list_detail/index.vue
@@ -28,9 +28,10 @@
          <IconFont name="rect-right" size="15" color="#333333"></IconFont>
        </view>
        <view class="text-[#9C9C9C] text-[20px]"
-          >订单剩余<text class="text-[#FF0000]">{{ timeStr }}</text
-          >过期，请尽快核销！</view
-        >
+          >订单剩余
+          <text class="text-[#FF0000]">{{ timeStr }} </text>
+          过期，请尽快核销！
+        </view>
      </view>
      <view v-if="goodInfo.status === 2">
        <view class="flex text-[#333333] items-center mb-1">
@@ -76,11 +77,11 @@
            <image
              @tap="toPhone()"
              class="w-[50px] h-[50px]"
-              src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
+              src="https://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
            <image
              @tap="toAdder()"
              class="w-[50px] h-[50px] ml-2"
-              src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
+              src="https://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
          </view>
        </view>
      </view>
@@ -99,8 +100,12 @@
              <view class="flex flex-col justify-between flex-1">
                <view class="title">{{ item.Goods?.name }}</view>
                <view class="text-[#F83D3D] mt-5">
-                  <view>{{ item.pay_price }}元</view>
-                  <view>{{ item.pay_integral }}积分</view>
+                  <view
+                    >{{ item.Goods.discount_price }}元
+                    <text v-if="item.Goods.exchange > 0"
+                      >+{{ item.Goods.exchange }}积分</text
+                    >
+                  </view>
                </view>
              </view>
              <view class="right">
@@ -109,16 +114,16 @@
            </view>
            <view
              class="flex justify-between items-center mt-2 mb-2 text-[25px]">
-              <view class="text-[#9C9C9C]">{{
-                `共${goodInfo.count}件商品`
-              }}</view>
-              <text
-                >{{ goodInfo.status !== 0 ? '实' : '应' }}付款{{
-                  goodInfo.pay_type === 1 ? '(元): ' : '(积分): '
-                }}{{
-                  goodInfo.pay_type === 1 ? goodInfo.price : goodInfo.exchange
-                }}</text
+              <view class="text-[#9C9C9C]"
+                >{{ `共${goodInfo.count}件商品` }}
+              </view>
+              <text class="text-[26px]"
+                >{{ goodInfo.status !== 0 ? '实' : '应' }}付款:
+                {{ goodInfo.discount_price }} (元)
+                <text v-if="goodInfo.exchange > 0"
+                  >积分抵扣: {{ goodInfo.exchange }}</text
                >
+              </text>
            </view>
          </view>
        </template>
@@ -155,16 +160,16 @@
        type="primary"
        block
        @click="openPay()"
-        >继续付款</nut-button
-      >
+        >继续付款
+      </nut-button>
      <nut-button
        v-if="goodInfo.status === 1"
        shape="square"
        type="primary"
        block
        @click="openCode()"
-        >出示核销码</nut-button
-      >
+        >出示核销码
+      </nut-button>
    </view>

    <!-- <view class="btn">
@@ -231,7 +236,6 @@ import {onUnmounted, ref} from 'vue';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import Pay from '@/components/Pay.vue';
-import {getUserPoint} from '@/api/admin';
 import { calculateDistance } from '@/utils';
 import { IconFont } from '@nutui/icons-vue-taro';
 import { getActiveOrderDetail } from '@/api/goods';
@@ -264,6 +268,9 @@ Taro.useLoad(options => {
  type.value = options.type;
  oid.value = options.orderId;
  tId.value = Number(options.OrderType);
+});
+
+Taro.useDidShow(() => {
  Taro.getLocation({
    type: 'wgs84',
    success: res => {
@@ -273,7 +280,7 @@ Taro.useLoad(options => {
  });
  // goodInfo.value = Taro.getStorageSync('item');
  getOrderDetail();
-});
+})

 const getOrderDetail = async () => {
  const res = await getActiveOrderDetail({
--- a/src/pages/users/pending_order/index.vue
+++ b/src/pages/users/pending_order/index.vue
@@ -27,7 +27,7 @@
    <view v-if="listData.length > 0">
      <view
        class="card"
-        v-for="(item, index) in (listData as any[])"
+        v-for="(item, index) in listData as any[]"
        :key="index">
        <view class="header">
          <view>
--- a/src/static/index/title.png
+++ b/src/static/index/title.png
--- a/src/static/logo-1.jpg
+++ b/src/static/logo-1.jpg
--- a/src/static/popTip-1.png
+++ b/src/static/popTip-1.png
--- a/src/static/popTip.png
+++ b/src/static/popTip.png
--- a/src/static/zhenggai.png
+++ b/src/static/zhenggai.png
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -83,3 +83,31 @@ export function showTips(msg: string) {
    icon: 'none',
  });
 }
+
+// 防抖函数
+export function debounce(fn: Function, delay: number = 500) {
+  let timer: any = null;
+  return function (...args: any[]) {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    timer = setTimeout(() => {
+      fn.apply(this, args);
+    }, delay);
+  };
+}
+
+/* @param fn 节流函数
+ * @param delay 节流时间
+ */
+export function throttle(fn: Function, delay: number) {
+  let timer: any = null;
+  return function (...args: any[]) {
+    if (!timer) {
+      timer = setTimeout(() => {
+        fn.apply(this, args);
+        timer = null;
+      }, delay);
+    }
+  };
+}
--- a/src/utils/js_sdk/u-charts.min.js
+++ b/src/utils/js_sdk/u-charts.min.js
@@ -2,7 +2,7 @@
 * uCharts (R)
 * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360/快手）、Vue、Taro等支持canvas的框架平台
 * Copyright (C) 2021 QIUN (R) 秋云 https://www.ucharts.cn All rights reserved.
- * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * Licensed ( https://www.apache.org/licenses/LICENSE-2.0 )
 * 复制使用请保留本段注释，感谢支持开源！
 *
 * uCharts (R) 官方网站
@@ -12,7 +12,7 @@
 * https://gitee.com/uCharts/uCharts
 *
 * uni-app插件市场地址：
- * http://ext.dcloud.net.cn/plugin?id=271
+ * https://ext.dcloud.net.cn/plugin?id=271
 *
 */
 'use strict';
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -28,7 +28,7 @@ const request = (
        token: Taro.getStorageSync('token') || '',
      },
      success: ({ data }) => {
-        if (data.code !== 200) {
+        if (data.code !== 200 && data.code !== 401) {
          if (!IGNORED_TIPS.includes(url)) {
            Taro.showToast({
              title: data.msg,
@@ -36,9 +36,26 @@ const request = (
            });
          }
          reject(data);
-        } else {
-          resolve(data);
+          return;
        }
+        if (data.code === 401) {
+          Taro.showModal({
+            title: '提示',
+            content: '你当前未登录,是否前往登录？',
+            confirmText: '去登录',
+            cancelText: '暂不登录',
+            success: ({ confirm }) => {
+              if (confirm) {
+                Taro.reLaunch({
+                  url: '/pages/users/login/index',
+                });
+              }
+            },
+          });
+          reject(data);
+          return;
+        }
+        resolve(data);
      },
      fail: err => {
        reject(err);
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -2,7 +2,16 @@
 module.exports = {
  content: ['./src/pages/index.html', './src/**/*.{html,js,ts,jsx,tsx,vue}'],
  theme: {
-    extend: {},
+    extend: {
+      colors: {
+        primary: '#fa2c19', // Theme Red
+        secondary: '#ff5d45', // Lighter Red
+        surface: '#ffffff',
+      },
+      boxShadow: {
+        'card': '0 2px 8px rgba(0, 0, 0, 0.04)',
+      },
+    },
  },
  plugins: [],
  corePlugins: {
Author	SHA1	Message	Date
lumoney	5c0036acfd	fix(other): bug修复 Some checks failed CI Build & Upload (WeApp) / build-upload-dev (push) Failing after 2m31s Details CI Build & Upload (WeApp) / build-upload-prod (push) Has been skipped Details CI Build & Upload (WeApp) / build-upload-reserve (push) Has been skipped Details	2026-01-10 21:30:50 +08:00
YuanHuakk	2c38893c43	fix(components): 修复搜索页样式错乱 Some checks failed CI Build & Upload (WeApp) / build-upload-dev (push) Failing after 3m58s Details CI Build & Upload (WeApp) / build-upload-prod (push) Has been skipped Details CI Build & Upload (WeApp) / build-upload-reserve (push) Has been skipped Details	2025-12-03 01:17:06 +08:00
YuanHuakk	a30d3572a5	feat(projects): 首页主备优化 All checks were successful CI Build & Upload (WeApp) / build-upload-dev (push) Has been skipped Details CI Build & Upload (WeApp) / build-upload-prod (push) Successful in 6m43s Details CI Build & Upload (WeApp) / build-upload-reserve (push) Successful in 2m25s Details	2025-12-02 23:57:04 +08:00
YuanHuakk	b6b6649a9b	ci(other): ci脚本换源 All checks were successful CI Build & Upload (WeApp) / build-upload-dev (push) Has been skipped Details CI Build & Upload (WeApp) / build-upload-prod (push) Successful in 4m55s Details CI Build & Upload (WeApp) / build-upload-reserve (push) Successful in 2m34s Details	2025-11-05 11:56:16 +08:00
YuanHuakk	985c8fa766	release(other): 4.0.15 Some checks failed CI Build & Upload (WeApp) / build-upload-prod (push) Has been cancelled Details CI Build & Upload (WeApp) / build-upload-reserve (push) Has been cancelled Details CI Build & Upload (WeApp) / build-upload-dev (push) Has been cancelled Details	2025-11-05 11:32:38 +08:00
YuanHuakk	ef380ff569	release(other): 4.0.14 Some checks failed CI Build & Upload (WeApp) / build-upload-dev (push) Has been skipped Details CI Build & Upload (WeApp) / build-upload-prod (push) Failing after 4m44s Details CI Build & Upload (WeApp) / build-upload-reserve (push) Successful in 19m24s Details	2025-10-31 19:15:29 +08:00
YuanHuakk	63b61bbc98	ci(other): ci update	2025-10-31 19:13:49 +08:00
YuanHuakk	d831ee932b	release: 临时紧急版本 All checks were successful continuous-integration/drone/push Build is passing Details	2025-10-29 12:39:01 +08:00
YuanHuakk	8b55419643	fix(依赖升级,bug 修复): All checks were successful continuous-integration/drone/push Build is passing Details	2025-09-13 16:26:39 +08:00
YuanHuakk	f567cf7c94	build(deps): 依赖升级	2025-09-13 03:26:33 +08:00
YuanHuakk	e1c00d6bb1	style(custom): ok All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-20 07:52:00 +08:00
YuanHuakk	9edcf67620	style(custom): add eslint rules All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-18 21:46:34 +08:00
YuanHuakk	8ca7001e3f	feat(custom): 商家详情整改增加未登录引导弹窗 All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-18 21:43:16 +08:00
YuanHuakk	6f5d722e6e	refactor(custom): 登录页面增加显式返回键 All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-16 23:17:57 +08:00
YuanHuakk	6ca3669950	refactor(custom): 地图服务商更换 All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-16 17:51:31 +08:00
YuanHuakk	54b1d4b07c	refactor(custom): 地图Key变更 All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-29 16:00:15 +08:00
YuanHuakk	896acaef9e	feat(custom): 地图apiKey更换，订单核销详情新增支付方式 All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-29 15:45:16 +08:00
YuanHuakk	92d7bf1933	feat(custom): 订单核销新增最近核销 All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-30 08:26:26 +08:00
YuanHuakk	9af020af37	ci(custom): update All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-18 16:17:30 +08:00
YuanHuakk	e7fc232ba7	ci(custom): update Some checks failed continuous-integration/drone/push Build is failing Details	2025-03-18 15:53:37 +08:00
YuanHuakk	2b2e8ae481	ci(custom): update Some checks failed continuous-integration/drone/push Build is failing Details	2025-03-18 15:52:08 +08:00
YuanHuakk	8ece6b24e8	refactor(custom): 核销弹窗更改 Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2025-03-18 15:44:57 +08:00
YuanHuakk	b475228705	ci(custom): update Some checks failed continuous-integration/drone/push Build is failing Details	2025-02-13 16:42:06 +08:00
YuanHuakk	05caf08c47	build(deps): taro升级至4.0.9 Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-02-12 11:15:51 +08:00
YuanHuakk	7096e38967	release(custom): 4.0.7 All checks were successful continuous-integration/drone/push Build is passing Details	2025-01-06 17:07:17 +08:00
YuanHuakk	3926922925	mod(custom): 增加公告弹窗 All checks were successful continuous-integration/drone/push Build is passing Details	2024-12-30 19:59:00 +08:00
YuanHuakk	90f1764e7b	refactor(custom): 暂时取消游戏进入限制 All checks were successful continuous-integration/drone/push Build is passing Details	2024-11-19 04:32:05 +08:00
YuanHuakk	52e49cca6c	fix(projects): env All checks were successful continuous-integration/drone/push Build is passing Details	2024-11-19 02:51:53 +08:00
YuanHuakk	72705cb101	feat(custom): 增加没有豆子不可进入游戏 All checks were successful continuous-integration/drone/push Build is passing Details	2024-11-18 22:56:23 +08:00
YuanHuakk	7eed620962	feat(custom): 游戏大厅合并 All checks were successful continuous-integration/drone/push Build is passing Details	2024-11-18 22:49:00 +08:00
YuanHuakk	a0e7966ee4	feat(custom): 新增商家订单管理筛选 All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-21 17:32:26 +08:00
YuanHuakk	3489cabed1	Merge branch 'master' into dev All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-14 22:13:04 +08:00
YuanHuakk	b9a5993e27	feat(custom): 现金部分 All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-14 22:12:14 +08:00
YuanHuakk	b2ac7f33f3	mod(custom): change All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-05 04:20:23 +08:00
YuanHuakk	4651318619	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-24 16:12:45 +08:00
YuanHuakk	8e119162f1	build(deps): update deps All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-24 16:02:44 +08:00
YuanHuakk	097029128c	fix(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-23 20:43:11 +08:00
YuanHuakk	b5361277ca	fix(custom): fix All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-14 01:34:36 +08:00
Huakk	af34993f69	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-06 21:39:16 +08:00
Huakk	94822f693a	release(custom): All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-06 21:35:17 +08:00
Huakk	2f31aa7b70	feat(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-05 20:17:16 +08:00
Huakk	94b6a9da10	feat(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-05 16:41:26 +08:00
YuanHuakk	962d7a2b19	feat(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-03 22:17:38 +08:00
YuanHuakk	20d112246e	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-30 18:35:05 +08:00
YuanHuakk	d57f9cc53e	refactor(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-30 18:34:18 +08:00
YuanHuakk	230cd88f4d	style(styles): lf All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-30 13:24:21 +08:00
YuanHuakk	b95fb364df	feat(components): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-30 13:22:42 +08:00
YuanHuakk	1e7f5c3d71	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-27 18:29:33 +08:00
YuanHuakk	e5041c3382	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-21 18:11:41 +08:00
Huakk	9a57e2cc25	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-05 10:29:47 +08:00
Huakk	6318b525a9	Merge branch 'dev' Some checks failed continuous-integration/drone/push Build is failing Details	2024-08-05 06:34:55 +08:00
Huakk	5db8a03723	Merge branch 'test' Some checks failed continuous-integration/drone/push Build is failing Details	2024-08-05 05:43:20 +08:00
Huakk	6acb85d242	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-03 23:32:56 +08:00
Huakk	004a6e188a	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-08-03 23:20:08 +08:00
Huakk	621dc85f1f	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-07-28 18:51:57 +08:00
Huakk	c1d1b949e4	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-07-28 10:48:03 +08:00
Huakk	18c6446e5e	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-07-20 18:47:35 +08:00
Huakk	8bc22dcc97	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-29 11:25:13 +08:00
Huakk	45ad285ae9	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-06-06 21:13:13 +08:00
Huakk	cf805f24ce	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-29 15:15:37 +08:00
Huakk	8f310cad8f	Merge branch 'test' All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-29 15:10:19 +08:00
Huakk	43ca8bd41a	fix(custom): All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-17 18:10:02 +08:00