Merge branch 'test'

.cz-config.js

@@ -0,0 +1,57 @@
+module.exports = {
+  types: [
+    { value: "feat", name: "feat:      新增功能" },
+    { value: "fix", name: "fix:       修复bug" },
+    { value: "docs", name: "docs:      文档变更" },
+    {
+      value: "style",
+      name: "style:     代码格式（不影响功能，例如空格、分号等格式修正）",
+    },
+    {
+      value: "refactor",
+      name: "refactor:  代码重构（不包括 bug 修复、功能新增）",
+    },
+    { value: "perf", name: "perf:      性能优化" },
+    { value: "test", name: "test:      添加、修改测试用例" },
+    {
+      value: "build",
+      name: "build:     构建流程、外部依赖变更（如升级 npm 包、修改 脚手架 配置等）",
+    },
+    { value: "ci", name: "ci:        修改 CI 配置、脚本" },
+    {
+      value: "chore",
+      name: "chore:     对构建过程或辅助工具和库的更改（不影响源文件、测试用例）",
+    },
+    { value: "revert", name: "revert:    回滚 commit" },
+    { value: "wip", name: "wip:       开发中" },
+    { value: "mod", name: "mod:       不确定分类的修改" },
+    { value: "release", name: "release:   发布" },
+  ],
+  scopes: [
+    ["custom", "自定义"],
+    ["projects", "项目搭建"],
+    ["components", "组件相关"],
+    ["utils", "utils 相关"],
+    ["styles", "样式相关"],
+    ["deps", "项目依赖"],
+    ["other", "其他修改"],
+  ].map(([value, description]) => {
+    return {
+      value,
+      name: `${value.padEnd(30)} (${description})`,
+    };
+  }),
+  messages: {
+    type: "确保本次提交遵循 Angular 规范！选择你要提交的类型：\n",
+    scope: "选择一个 scope（可选）：",
+    customScope: "请输入自定义的 scope：",
+    subject: "填写简短精炼的变更描述：",
+    body: '填写更加详细的变更描述（可选）。使用 "|" 换行：',
+    breaking: "列举非兼容性重大的变更（可选）：",
+    footer: "列举出所有变更的 Issues Closed（可选）。 例如: #31, #34：",
+    confirmCommit: "确认提交？",
+  },
+  allowBreakingChanges: ["feat", "fix"],
+  subjectLimit: 100,
+  breaklineChar: "|",
+};

.editorconfig

@@ -5,7 +5,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false

.env.development

@@ -1,8 +1,11 @@
 # 开发版appid
 TARO_APP_ID='wx7b3322daa2cf9c88'
 
+# 开发版appkey
+TARO_APP_KEY='1234567890'
+
 # API接口
 TARO_APP_API='https://test.wanzhuanyongcheng.cn/app'
 
 # 游戏链接
-TARO_APP_GAME='https://game.wanzhuanyongcheng.cn/public/#/pages/index/index?uid='
+TARO_APP_GAME='https://jdt-test-tz.wanzhuanyongcheng.cn/pages/index/index?uid='

.env.production

@@ -1,7 +1,10 @@
 # 正式版版appid
 TARO_APP_ID='wxdd00d46fa6f07974'
 
+# 开发版appkey
+TARO_APP_KEY='private.wxdd00d46fa6f07974.key'
+
 # API接口
 TARO_APP_API='https://www.wanzhuanyongcheng.cn/app'
 
-TARO_APP_GAME = 'https://www.jdt168.com/public/#/pages/index/index?uid='
+TARO_APP_GAME='https://jdt-prod-tz.wanzhuanyongcheng.cn/pages/index/index?uid='

.env.test

@@ -1,8 +1,11 @@
 # 开发版appid
 TARO_APP_ID='wx7b3322daa2cf9c88'
 
+# 开发版appkey
+TARO_APP_KEY='private.wx7b3322daa2cf9c88.key'
+
 # API接口
 TARO_APP_API='https://test.wanzhuanyongcheng.cn/app'
 
 # 游戏链接
-TARO_APP_GAME = 'https://game.wanzhuanyongcheng.cn/public/#/pages/index/index?uid='
+TARO_APP_GAME='https://jdt-test-tz.wanzhuanyongcheng.cn/pages/index/index?uid='

.eslintrc

@@ -0,0 +1,8 @@
+// ESLint 检查 .vue 文件需要单独配置编辑器：
+// https://eslint.vuejs.org/user-guide/#editor-integrations
+{
+  "extends": ["taro/vue3"],
+  "rules": {
+    "vue/multi-word-component-names": "off"
+  }
+}

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit "$1"

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run lint:staged

.prettierignore

@@ -0,0 +1,3 @@
+/node_modules/**
+/dist/*
+/public/*

babel.config.js

@@ -2,9 +2,12 @@
 // https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
 module.exports = {
   presets: [
-    ['taro', {
+    [
-      framework: 'vue3',
+      "taro",
-      ts: true
+      {
-    }]
+        framework: "vue3",
-  ]
+        ts: true,
-}
+      },
+    ],
+  ],
+};

commitlint.config.js

@@ -0,0 +1,26 @@
+module.exports = {
+  ignores: [(commit) => commit.includes("init")],
+  extends: ["@commitlint/config-conventional"],
+  rules: {
+    "type-enum": [
+      2,
+      "always",
+      [
+        "feat",
+        "fix",
+        "docs",
+        "style",
+        "refactor",
+        "perf",
+        "test",
+        "build",
+        "ci",
+        "chore",
+        "revert",
+        "wip",
+        "mod",
+        "release",
+      ],
+    ],
+  },
+};

components.d.ts

@@ -1,49 +1,52 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
+import "@vue/runtime-core";
 
-export {}
+export {};
 
-declare module '@vue/runtime-core' {
+declare module "@vue/runtime-core" {
   export interface GlobalComponents {
-    Auth: typeof import('./src/components/Auth.vue')['default']
+    Auth: typeof import("./src/components/Auth.vue")["default"];
-    NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
+    Cart: typeof import("./src/components/Cart.vue")["default"];
-    NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
+    MerList: typeof import("./src/components/MerList.vue")["default"];
-    NutButton: typeof import('@nutui/nutui-taro')['Button']
+    NutAvatar: typeof import("@nutui/nutui-taro")["Avatar"];
-    NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
+    NutBacktop: typeof import("@nutui/nutui-taro")["Backtop"];
-    NutCell: typeof import('@nutui/nutui-taro')['Cell']
+    NutButton: typeof import("@nutui/nutui-taro")["Button"];
-    NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']
+    NutCalendar: typeof import("@nutui/nutui-taro")["Calendar"];
-    NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
+    NutCell: typeof import("@nutui/nutui-taro")["Cell"];
-    NutDialog: typeof import('@nutui/nutui-taro')['Dialog']
+    NutCellGroup: typeof import("@nutui/nutui-taro")["CellGroup"];
-    NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']
+    NutCheckbox: typeof import("@nutui/nutui-taro")["Checkbox"];
-    NutEmpty: typeof import('@nutui/nutui-taro')['Empty']
+    NutCheckboxGroup: typeof import("@nutui/nutui-taro")["CheckboxGroup"];
-    NutForm: typeof import('@nutui/nutui-taro')['Form']
+    NutDialog: typeof import("@nutui/nutui-taro")["Dialog"];
-    NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']
+    NutEllipsis: typeof import("@nutui/nutui-taro")["Ellipsis"];
-    NutGrid: typeof import('@nutui/nutui-taro')['Grid']
+    NutEmpty: typeof import("@nutui/nutui-taro")["Empty"];
-    NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']
+    NutForm: typeof import("@nutui/nutui-taro")["Form"];
-    NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
+    NutFormItem: typeof import("@nutui/nutui-taro")["FormItem"];
-    NutInput: typeof import('@nutui/nutui-taro')['Input']
+    NutGrid: typeof import("@nutui/nutui-taro")["Grid"];
-    NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
+    NutGridItem: typeof import("@nutui/nutui-taro")["GridItem"];
-    NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
+    NutImagePreview: typeof import("@nutui/nutui-taro")["ImagePreview"];
-    NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
+    NutInput: typeof import("@nutui/nutui-taro")["Input"];
-    NutPicker: typeof import('@nutui/nutui-taro')['Picker']
+    NutInputNumber: typeof import("@nutui/nutui-taro")["InputNumber"];
-    NutPopup: typeof import('@nutui/nutui-taro')['Popup']
+    NutOverlay: typeof import("@nutui/nutui-taro")["Overlay"];
-    NutPrice: typeof import('@nutui/nutui-taro')['Price']
+    NutPagination: typeof import("@nutui/nutui-taro")["Pagination"];
-    NutSearchbar: typeof import('@nutui/nutui-taro')['Searchbar']
+    NutPicker: typeof import("@nutui/nutui-taro")["Picker"];
-    NutSwipe: typeof import('@nutui/nutui-taro')['Swipe']
+    NutPopup: typeof import("@nutui/nutui-taro")["Popup"];
-    NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
+    NutPrice: typeof import("@nutui/nutui-taro")["Price"];
-    NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
+    NutSearchbar: typeof import("@nutui/nutui-taro")["Searchbar"];
-    NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
+    NutSwiper: typeof import("@nutui/nutui-taro")["Swiper"];
-    NutTable: typeof import('@nutui/nutui-taro')['Table']
+    NutSwiperItem: typeof import("@nutui/nutui-taro")["SwiperItem"];
-    NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
+    NutSwitch: typeof import("@nutui/nutui-taro")["Switch"];
-    NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
+    NutTable: typeof import("@nutui/nutui-taro")["Table"];
-    NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
+    NutTabPane: typeof import("@nutui/nutui-taro")["TabPane"];
-    NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
+    NutTabs: typeof import("@nutui/nutui-taro")["Tabs"];
-    Pay: typeof import('./src/components/Pay.vue')['default']
+    NutTextarea: typeof import("@nutui/nutui-taro")["Textarea"];
-    RichEditor: typeof import('./src/components/RichEditor.vue')['default']
+    NutUploader: typeof import("@nutui/nutui-taro")["Uploader"];
-    Ucharts: typeof import('./src/components/Ucharts.vue')['default']
+    Pay: typeof import("./src/components/Pay.vue")["default"];
-    Upload: typeof import('./src/components/Upload.vue')['default']
+    Popup: typeof import("./src/components/Popup.vue")["default"];
-    UserModal: typeof import('./src/components/UserModal.vue')['default']
+    RichEditor: typeof import("./src/components/RichEditor.vue")["default"];
+    Ucharts: typeof import("./src/components/Ucharts.vue")["default"];
+    Upload: typeof import("./src/components/Upload.vue")["default"];
+    UserModal: typeof import("./src/components/UserModal.vue")["default"];
   }
 }

config/dev.ts

@@ -2,9 +2,9 @@
 
 module.exports = {
   env: {
-        NODE_ENV: '"development"'
+    NODE_ENV: '"development"',
   },
   defineConstants: {},
   mini: {},
-    h5: {}
+  h5: {},
-}
+};

config/index.ts

@@ -1,105 +1,125 @@
 // @ts-nocheck
-import Components from 'unplugin-vue-components/webpack'
+import Components from "unplugin-vue-components/webpack";
-import NutUIResolver from '@nutui/nutui-taro/dist/resolver'
+import NutUIResolver from "@nutui/nutui-taro/dist/resolver";
-import {join} from 'node:path'
+import { join } from "node:path";
+import { argv } from "yargs";
+
+const { robot = 1, desc } = argv;
+
+/**
+ * @typedef { import("@tarojs/plugin-mini-ci").CIOptions } CIOptions
+ * @type {CIOptions}
+ */
+const CIPluginOpt = {
+  weapp: {
+    appid: process.env.TARO_APP_ID,
+    privateKeyPath: process.env.TARO_APP_KEY,
+    robot,
+  },
+  desc,
+};
 
 const config = {
-    projectName: 'taroApp',
+  projectName: "taroApp",
-    date: '2023-8-13',
+  date: "2023-8-13",
-    designWidth(input: { file: string; }) {
+  designWidth(input: { file: string }) {
-        if (input?.file?.replace(/\\+/g, '/').indexOf('@nutui') > -1) {
+    if (input?.file?.replace(/\\+/g, "/").indexOf("@nutui") > -1) {
-            return 375
+      return 375;
     }
-        return 750
+    return 750;
   },
   deviceRatio: {
     640: 2.34 / 2,
     750: 1,
     828: 1.81 / 2,
-        375: 2
+    375: 2,
   },
-    sourceRoot: 'src',
+  sourceRoot: "src",
-    outputRoot: 'dist',
+  outputRoot: "dist",
-    plugins: ['@tarojs/plugin-html'],
+  plugins: ["@tarojs/plugin-html", ["@tarojs/plugin-mini-ci", CIPluginOpt]],
   defineConstants: {},
   copy: {
     patterns: [],
-        options: {}
+    options: {},
   },
-    framework: 'vue3',
+  framework: "vue3",
   compiler: {
-        type: 'webpack5',
+    type: "webpack5",
-        prebundle: {enable: false}
+    prebundle: { enable: false },
   },
   cache: {
-        enable: false // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
+    enable: false, // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
   },
   sass: {
-        data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`
+    data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`,
   },
   alias: {
-        '@': join(__dirname, '..', 'src')
+    "@": join(__dirname, "..", "src"),
   },
   mini: {
     webpackChain(chain) {
-            chain.plugin('unplugin-vue-components').use(Components({
+      chain.plugin("unplugin-vue-components").use(
-                resolvers: [NutUIResolver({taro: true})]
+        Components({
-            }))
+          resolvers: [NutUIResolver({ taro: true })],
+        })
+      );
     },
     miniCssExtractPluginOption: {
       //忽略css文件引入顺序
-            ignoreOrder: true
+      ignoreOrder: true,
     },
     postcss: {
       pxtransform: {
         enable: true,
         config: {
           // selectorBlackList: ['nut-']
-                }
+        },
       },
       url: {
         enable: true,
         config: {
-                    limit: 1024 // 设定转换尺寸上限
+          limit: 1024, // 设定转换尺寸上限
-                }
+        },
       },
       cssModules: {
         enable: true, // 默认为 false，如需使用 css modules 功能，则设为 true
         config: {
-                    namingPattern: 'module', // 转换模式，取值为 global/module
+          namingPattern: "module", // 转换模式，取值为 global/module
-                    generateScopedName: '[name]__[local]___[hash:base64:5]'
+          generateScopedName: "[name]__[local]___[hash:base64:5]",
-                }
+        },
-            }
+      },
-        }
+    },
   },
   h5: {
     webpackChain(chain) {
-            chain.plugin('unplugin-vue-components').use(Components({
+      chain.plugin("unplugin-vue-components").use(
-                resolvers: [NutUIResolver({taro: true})]
+        Components({
-            }))
+          resolvers: [NutUIResolver({ taro: true })],
+        })
+      );
     },
-        publicPath: '/',
+    publicPath: "/",
-        staticDirectory: 'static',
+    staticDirectory: "static",
-        esnextModules: ['nutui-taro', 'icons-vue-taro'],
+    esnextModules: ["nutui-taro", "icons-vue-taro"],
     postcss: {
       autoprefixer: {
         enable: true,
-                config: {}
+        config: {},
       },
       cssModules: {
         enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
         config: {
-                    namingPattern: 'module', // 转换模式，取值为 global/module
+          namingPattern: "module", // 转换模式，取值为 global/module
-                    generateScopedName: '[name]__[local]___[hash:base64:5]'
+          generateScopedName: "[name]__[local]___[hash:base64:5]",
-                }
+        },
-            }
+      },
-        }
+    },
-    }
+  },
-}
+};
 
 module.exports = function (merge) {
-    if (process.env.NODE_ENV === 'development') {
+  if (process.env.NODE_ENV === "development") {
-        return merge({}, config, require('./dev'))
+    return merge({}, config, require("./dev"));
-    }
-    return merge({}, config, require('./prod'))
   }
+  return merge({}, config, require("./prod"));
+};

config/prod.ts

@@ -2,7 +2,7 @@
 
 module.exports = {
   env: {
-        NODE_ENV: '"production"'
+    NODE_ENV: '"production"',
   },
   defineConstants: {},
   mini: {},
@@ -18,7 +18,6 @@ module.exports = {
     //    */
     //   chain.plugin('analyzer')
     //     .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
-
     //   /**
     //    * 如果 h5 端首屏加载时间过长，可以使用 prerender-spa-plugin 插件预加载首页。
     //    * @docs https://github.com/chrisvfritz/prerender-spa-plugin
@@ -34,5 +33,5 @@ module.exports = {
     //       postProcess: (context) => ({ ...context, outputPath: path.join(staticDir, 'index.html') })
     //     }))
     // }
-    }
+  },
-}
+};

package.json

@@ -1,13 +1,16 @@
 {
-  "name": "taroApp",
+  "name": "jdt-user",
-  "version": "1.0.0",
+  "version": "3.0.0",
   "private": true,
   "description": "",
   "templateInfo": {
-    "name": "vue3-NutUI4",
+    "name": "jdt-user",
     "typescript": true,
     "css": "sass"
   },
+  "taroConfig": {
+    "version": "3.0.0"
+  },
   "scripts": {
     "build:weapp": "taro build --type weapp",
     "build:test": "taro build --type weapp --mode test",
@@ -27,7 +30,16 @@
     "dev:rn": "npm run build:rn -- --watch",
     "dev:qq": "npm run build:qq -- --watch",
     "dev:jd": "npm run build:jd -- --watch",
-    "dev:quickapp": "npm run build:quickapp -- --watch"
+    "dev:quickapp": "npm run build:quickapp -- --watch",
+    "lint": "eslint --ext .ts,.vue .",
+    "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 .",
+    "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'",
+    "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test"
   },
   "browserslist": [
     "last 3 versions",
@@ -35,51 +47,69 @@
     "ios >= 8"
   ],
   "author": "",
+  "lint-staged": {
+    "*.{ts,vue}": [
+      "eslint --ext .ts,.vue .",
+      "npx prettier --write --end-of-line lf ."
+    ]
+  },
+  "config": {
+    "commitizen": {
+      "path": "node_modules/cz-customizable"
+    }
+  },
   "dependencies": {
-      "@babel/runtime": "^7.23.1",
+    "@babel/runtime": "^7.23.2",
     "@nutui/icons-vue-taro": "^0.0.9",
-      "@nutui/nutui-taro": "^4.1.6",
+    "@nutui/nutui-taro": "^4.2.0",
     "@qiun/vue-ucharts": "2.5.0-20230101",
-    "@tarojs/components": "3.6.16",
+    "@tarojs/components": "3.6.19",
-    "@tarojs/helper": "3.6.16",
+    "@tarojs/helper": "3.6.19",
-    "@tarojs/plugin-framework-vue3": "3.6.16",
+    "@tarojs/plugin-framework-vue3": "3.6.19",
-    "@tarojs/plugin-html": "3.6.16",
+    "@tarojs/plugin-html": "3.6.19",
-    "@tarojs/plugin-platform-alipay": "3.6.16",
+    "@tarojs/plugin-platform-alipay": "3.6.19",
-    "@tarojs/plugin-platform-h5": "3.6.16",
+    "@tarojs/plugin-platform-h5": "3.6.19",
-    "@tarojs/plugin-platform-jd": "3.6.16",
+    "@tarojs/plugin-platform-jd": "3.6.19",
-    "@tarojs/plugin-platform-qq": "3.6.16",
+    "@tarojs/plugin-platform-qq": "3.6.19",
-    "@tarojs/plugin-platform-swan": "3.6.16",
+    "@tarojs/plugin-platform-swan": "3.6.19",
-    "@tarojs/plugin-platform-tt": "3.6.16",
+    "@tarojs/plugin-platform-tt": "3.6.19",
-    "@tarojs/plugin-platform-weapp": "3.6.16",
+    "@tarojs/plugin-platform-weapp": "3.6.19",
-    "@tarojs/runtime": "3.6.16",
+    "@tarojs/runtime": "3.6.19",
-    "@tarojs/shared": "3.6.16",
+    "@tarojs/shared": "3.6.19",
-    "@tarojs/taro": "3.6.16",
+    "@tarojs/taro": "3.6.19",
     "dayjs": "^1.11.10",
-    "pinia": "^2.1.6",
+    "pinia": "^2.1.7",
-    "vue": "^3.3.4"
+    "vue": "^3.3.8"
   },
   "devDependencies": {
-      "@babel/core": "^7.23.0",
+    "@babel/core": "^7.23.3",
-    "@tarojs/cli": "3.6.16",
+    "@commitlint/cli": "^18.2.0",
-    "@tarojs/taro-loader": "3.6.16",
+    "@commitlint/config-conventional": "^18.1.0",
-    "@tarojs/webpack5-runner": "3.6.16",
+    "@tarojs/cli": "3.6.19",
-      "@types/node": "^18.18.4",
+    "@tarojs/plugin-mini-ci": "^3.6.20",
-      "@types/webpack-env": "^1.18.2",
+    "@tarojs/taro-loader": "3.6.19",
-      "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@tarojs/webpack5-runner": "3.6.19",
-      "@typescript-eslint/parser": "^6.7.4",
+    "@types/node": "^18.18.9",
+    "@types/webpack-env": "^1.18.4",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "@vue/babel-plugin-jsx": "^1.1.5",
-    "@vue/compiler-sfc": "^3.3.4",
+    "@vue/compiler-sfc": "^3.3.8",
-    "babel-preset-taro": "3.6.16",
+    "babel-preset-taro": "3.6.19",
+    "commitizen": "^4.3.0",
     "css-loader": "3.4.2",
-      "eslint": "^8.51.0",
+    "cz-customizable": "^7.0.0",
-    "eslint-config-taro": "3.6.16",
+    "eslint": "^8.53.0",
-    "eslint-plugin-vue": "^9.17.0",
+    "eslint-config-taro": "3.6.19",
+    "eslint-plugin-vue": "^9.18.1",
+    "husky": "^8.0.3",
+    "lint-staged": "^15.0.2",
     "style-loader": "1.3.0",
     "stylelint": "9.3.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
     "unplugin-vue-components": "^0.23.0",
-      "vue-loader": "^17.3.0",
+    "vue-loader": "^17.3.1",
-    "webpack": "^5.88.2"
+    "webpack": "^5.89.0"
   }
 }

private.wx7b3322daa2cf9c88.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqSpzKeiW3x8pHNgPNxnhx4wb5gyM21cJcwE5N+82iX0qMH2f
+QcU8WVyHvuYDK9d7kuzDFSbFNsUUeUB/Mqt2rzZcrGyO/6cRUaV8hjXClf4vZGvK
+gzMEExNzSIxwu+XYAur9FKm2h4J300PvmGD6zPGyr7pqYyzkSpltadRVsQebU1Cb
+f+gCmyzQSDY+dk+0cNmPeSJxXdbj6PJpmU+PVe9CoWmfapRqV3aEDWhTlOvTUQwf
+8bOoZn5r8a6H2W0HdNu0flMnoYWX/WNSTOF4izlaKOq7oRLnfjaefEO+WOUctzPE
+HpWw/k/LyMZJCiGZVdczfVSkR2Jq4iMC4arrDwIDAQABAoIBABeCgsbMQEt59SjB
+DjxGKI6m9imejOTez71f6ifP4vBwqLBchQmK87wnk+X/6WjqZY4hwWrrHHVkJlhD
+kmnkUnY/Q9nirGzzNwD10ryENCrMTKHUKSzapjJQfbETc4dphf/B0LJSc7+ZbjW6
+N04iDDj3TjIF4ksuLfwAHqiajd4wSpmiPFzwNFJSgNl86d3VuqnylPKDE0wG5yBf
+54AXkxrnzhL+cGCBazE+mYQoSihpDt0JP4zGb8W1AoWmXNoTlbP5AiTcf/1nza92
+HOd1IJN89YBgm707yEvY7pVsM5ftx8HlUtGopZq3DEBar3dTRT9+tGnLoOVyvbEF
+dvgV/oECgYEA0dNsZvHuAXIG62dgj+hLTtqxbdi0BaqChj2Y/bhLBbzjlScfiCJ/
+hczTSUMj1XAuYzZLXFHwEd7tZnXhhWOfALsFzodVoO6Zt5Y5lQ0Ed5d9GAg/JsDe
+Z1nn6WMH5c7+1gfpN+dzZVK/AWYZgYhIiaVFeiC5XxE4/mfFClIT0HECgYEAzmRv
+csA3WuuR9hSAl238g0bcDFjQS5I2tWJMRVDpA9m5A9tNCCIkh2Azn3LcGAnkPwbZ
+mCt0/Ck3hZPV7v9nuPAP9uOUC0+nGIaJSxcbZpH944meiVs3J+VQGcS4ubrEcaQ+
+KRT4fisnXI85/qc1r7XaziWgtCX7dvDHNFRQM38CgYEAuR2ZBp2siDPsbOTQaUXc
+ot4IKUxFTrZm3z4a6sUb0x0Zf657gCRHc2kIgxsr0xNcqYTuKa3Uaj/OHFYluAPy
+9LcLYXE+l3PJxBFSDfDlHwlUgM5NwMfpry6/jsUi45midHuYQwz8XskI4JgOKpxs
+uptH135lbL0KFlDAouFUv9ECgYADsa6A+knDWdYJ9oH6s+BCJUGJAwnvYFWUV4cP
+8ovJItt54zH0xE+tEJ676t1fnMW2DxRT8estHDu/K0838OBVYg6XF6mtriZKfRX1
+/xrhchl+OhdZVAWftC4D2A6KXHppokvuhk6QS4tvz6x1D18ZnwKkj+3Za5idn1+h
+YyTwVwKBgQCscqYudlBUyIuCnhxaaHNSwVDRvkYcncwIFGv8KMc9UChWehSj9mzb
+qmrsA1iifR1SW0vrGzNnzDo67BYNYhme3uNs5cfv6jmeMDj79eOIABJtYICSzHx2
+kzLzBtO804Q2CygVHae7qadf592Ex7b4CKfVVs4ZpqnknuoDKTWEGw==
+-----END RSA PRIVATE KEY-----

private.wxdd00d46fa6f07974.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA5MJntNKGXv+0z6Imaz0P/uZM57LiQwwmv6fLNsE8EzsW5JPC
+Bwvm1sWDJ670WxYQuXI2xEc4bXc4ACRdHwEPt1gJMbnXMCUh7HlzhRSh1mJQsMNP
+yVOFIz6lsAAnOrqHq2P7N1lOx8bIFwLr5HzeWYWj0XZWU4259JjJ+nn1EcBcaVtZ
+Txgn18K9MBSppc4vRQ/YEQF51LPNOs934vqHSnNEY0jW3HK+DXa5UPwT5Jj5RV16
+1aFiXAvxvY/DcaQKOx+CCA4QNa03ncmlLMLW1jZfQBijCnsrIfdMdsB/cJ2b1lpQ
+IiLZKiL8vBWR6tjdccD+XT62BMmfuCkpCJDAeQIDAQABAoIBAQCh4z4XBiFXm2gu
+xFah742hWwOzuLFMt424dhtmvWsxRNDXpAVcjTyoYxCFBdghmcTuJ/jAAJLbTNJR
+r2pDJbIkkuW2zgiOJskSG4T3+fjpyZvG7AFLvZJrtcr1ebZJZnXagZ/ntIj+8hrp
+xgSAJyoHen7LHg7LhHHDuli9rI8VJpDT5TZeXVXynD0bjMJ4z7MHA27ZO9nNk52P
+HML0pLYxs6+ubCL1IB5sy6gDO9eQUYzlVWEcDiVXBqlftjj100kbxvLVm0ydlwci
+SX2e/oV+iXPW0qiyOBjyc1Dp8uYxqYhvmdy7ajxL5f3mrepiydkI+lnYp9rnh9NO
+GfFvsQTNAoGBAPldj1JUXGB7TO5NAj0RiE2hkeQI6G3x3rDZz1DlkLs6oM7rAqds
+6EMMN7MONNQ53Qw0eFhuB/5gFH/EfDqufTjFIRiR9rcwa7NsYieewIfAksOJCyf1
+H3tfH+Wr0sQNIA/9tKzgzosSU1gcdCQFcmvzX+bUBowJ0oj0zSuskNeLAoGBAOrY
+fw2T7hQTJsiZ5y1GkhZ7Dq/l1qY3Mwodl339YzOxUFQyPDWC8UFHp9FZZ49CvG1Z
+1NUIN3fcIPORoKjCjdxvDh+PWUp0XV7Zp0yUtvehI8ex31U5Zc2nKfr3+ILhRS2b
+ZfoKX/3vQvItfpJfRlSZSpgt1Kl9XXE+O550eiiLAoGAXA2mt8y+oTtDJgE1n1eW
+ipnnYlfLfbK4824kcwebyxIUhO4Kd8XjY8Th1u6an/GQYU4JUxOjTcsoJhZhicQa
+I9fZpNlVS0DLsVuETH31MufrBdXUUXbSnVd7TeyFDKyPtneAuATxGjO0oqU2VonQ
+OHuKXorMs+t4VeiQyNuWSIsCgYBtjF4ADHBzZtehncEr6o589BxOyw0M7hTd9B3V
+xJxA4caR7/kMES/O/sj2rBjVyBCzhcL1OOb+/21TkSv7bP3VxOw2ppzFUXC4rRkQ
+bRLIgp95KK0ASU0G2KKJkqCXFNQ7SRERyUMr5i85XyV6y/y3u+YDBOX9xiAPkjMn
+YDgXrwKBgBlBiQxGI/JrzXgAoGox8sBmQcGplgnUL/QTJIiKugTbzfNA9STyW0E0
+j+Zcp2vf4wLZwOUMD74gGhtAUDMhOB+RlOUTFSHcyOAJ+Se9pZPNcaY6tqiZNeVS
+WsRqHJtoQkcUU2k+tCYXz2tib4R/FHgoL5QK/OkHRS61H481eWeZ
+-----END RSA PRIVATE KEY-----

src/api/admin.ts

@@ -1,40 +1,41 @@
-import request from '../utils/request'
+import request from "../utils/request";
 
 // 订单核销
 export const orderVerify = (data: object) =>
-    request('/user/cancelPointOrder', data, 'POST')
+  request("/user/cancelPointOrder", data, "POST");
 
 // 活动订单核销
 export const activeOrderVerify = (data: object) =>
-    request('/user/cancelOrder', data, 'POST')
+  request("/user/cancelOrder", data, "POST");
 
 // 获取订单统计
 export const orderStatistics = (data: object) =>
-    request('/store/order/count', data, 'POST')
+  request("/store/order/count", data, "POST");
 
 // 获取商家积分订单列表
 export const getJfOrderList = (data: object) =>
-    request('/store/point/order', data, 'POST')
+  request("/store/point/order", data, "POST");
 
 // 获取商家活动订单列表
 export const getActiveOrderList = (data: object) =>
-    request('/store/order', data, 'POST')
+  request("/store/order", data, "POST");
-
 
 // 获取积分核销列表
 export const getJfVerifyList = (data: object) =>
-    request('/point/order/details', data, 'POST')
+  request("/point/order/details", data, "POST");
 
 // 获取活动核销列表
 export const getActiveVerifyList = (data: object) =>
-    request('/order/details', data, 'POST')
+  request("/order/details", data, "POST");
 
 // 增长率统计
 export const growthRate = (data: object) =>
-    request('/store/date/count', data, 'POST')
+  request("/store/date/count", data, "POST");
 
 // 获取提现列表
-export const getWithdrawList = (data: object) => request('/store/withdraw', data, 'POST')
+export const getWithdrawList = (data: object) =>
+  request("/store/withdraw", data, "POST");
 
 // 获取提现列表
-export const addWithdraw = (data: object) => request('/store/withdraw/set', data, 'POST')
+export const addWithdraw = (data: object) =>
+  request("/store/withdraw/set", data, "POST");

src/api/cart.ts

@@ -0,0 +1,15 @@
+import request from "../utils/request";
+
+// 添加购物车
+export const addCart = (data: object) =>
+  request("/goods/cart/add", data, "POST");
+
+// 获取购物车
+export const getCart = (data: object) => request("/goods/cart", data, "POST");
+
+// 清空购物车
+export const clearCart = (data: object) =>
+  request("/goods/cart/removeAll", data, "POST");
+
+// 获取全部购物车
+export const getAllCart = () => request("/goods/all/cart", {}, "POST");

src/api/goods.ts

@@ -28,7 +28,7 @@ export const getActiveGoods = () => request("/goods", {}, "POST");
 export const getActiveGoodsDetail = (data: object) =>
   request("/goods/details", data, "POST");
 
-// 活动商品下单
+// 创建订单
 export const createActiveOrder = (data: object) =>
   request("/order/place", data, "POST");
 

src/api/home.ts

@@ -0,0 +1,7 @@
+import request from "../utils/request";
+
+// 获取商户分类
+export const getHomeList = () => request("/home/classify", {}, "POST");
+
+// 获取商户子列表
+export const getHomeSubList = () => request("/home/all/classify", {}, "POST");

src/api/product.ts

@@ -1,9 +1,9 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 商品列表
 export const productList = (data: object) =>
-    request('/store/goods', data, 'POST')
+  request("/store/goods", data, "POST");
 
 // 商品添加
 export const addGood = (data: object) =>
-    request('/store/goods/edit', data, 'POST')
+  request("/store/goods/edit", data, "POST");

src/api/user.ts

@@ -63,3 +63,12 @@ export const getRefereeCode = () => request("/user/promotion", {}, "POST");
 // 取消订单返回积分
 export const qxOrder = (data: object) =>
   request("/user/point/off", data, "POST");
+
+// 用户签到
+export const userSign = () => request("/sign/user", {}, "POST");
+
+// 获取签到记录
+export const getSignRecord = () => request("/sign/pulse/count", {}, "POST");
+// 获取赠送总记录
+export const getGiftRecord = (data: object) =>
+  request("/user/giftPulseRecord", data, "POST");

src/app.config.ts

@@ -1,81 +1,85 @@
 export default defineAppConfig({
   pages: [
-        'pages/index/index',
+    "pages/index/index",
-        'pages/category/index',
+    "pages/category/index",
-        'pages/cart/index',
+    "pages/cart/index",
-        'pages/user/index'
+    "pages/user/index",
   ],
   subPackages: [
     {
-            root: 'pages/users',
+      root: "pages/users",
       pages: [
-                'order_list/index',
+        "order_list/index",
-                'setting/index',
+        "setting/index",
-                'user_setting/index',
+        "user_setting/index",
-                'settled_mer/index',
+        "settled_mer/index",
-                'order_list_detail/index',
+        "order_list_detail/index",
-                'account/index',
+        "account/index",
-                'distribution/index',
+        "distribution/index",
-                'distribution/integral/index',
+        "distribution/integral/index",
-                'distribution/userlist/index',
+        "distribution/userlist/index",
-                'login/index',
+        "login/index",
-                'bindPhone/index'
+        "bindPhone/index",
-            ]
+      ],
     },
     {
-            root: 'pages/goods',
+      root: "pages/goods",
+      pages: ["goods_detail/index", "order_create/index", "order_status/index"],
+    },
+    {
+      root: "pages/admin",
       pages: [
-                'goods_detail/index',
+        "verify/index",
-                'order_create/index',
+        "order_manage/index",
-                'order_status/index'
+        "order_manage/list/index",
-            ]
+        "order_manage/detail/index",
+        "verify/verify_list/index",
+        "statistics/index",
+        "withdrawal/index",
+      ],
     },
     {
-            root: 'pages/admin',
+      root: "pages/product",
-            pages: [
+      pages: ["list/index", "addGoods/index"],
-                'verify/index',
-                'order_manage/index',
-                'order_manage/list/index',
-                'order_manage/detail/index',
-                'verify/verify_list/index',
-                'statistics/index',
-                'withdrawal/index'
-            ]
     },
     {
-            root: 'pages/product',
+      root: "pages/game",
-            pages: ['list/index', 'addGoods/index']
+      pages: ["gamehome/index", "gamedetail/index", "gameview/index"],
     },
     {
-            root: 'pages/game',
+      root: "pages/hotGoods",
-            pages: ['gamehome/index', 'gamedetail/index', 'gameview/index']
+      pages: ["index/index", "hot_list/index"],
     },
     {
-            root: 'pages/hotGoods',
+      root: "pages/mer",
-            pages: ['index/index', 'hot_list/index']
+      pages: ["mer_detail/index"],
     },
     {
-            root: 'pages/mer',
+      root: "pages/marketing",
-            pages: ['mer_detail/index']
+      pages: ["sign/index"],
-        }
+    },
+    {
+      root: "pages/search",
+      pages: ["index"],
+    },
   ],
   window: {
-        backgroundTextStyle: 'light',
+    backgroundTextStyle: "light",
-        navigationBarBackgroundColor: '#fff',
+    navigationBarBackgroundColor: "#fff",
-        navigationBarTitleText: 'WeChat',
+    navigationBarTitleText: "WeChat",
-        navigationBarTextStyle: 'black'
+    navigationBarTextStyle: "black",
   },
   tabBar: {
-        color: '#666666',
+    color: "#666666",
-        selectedColor: '#ff0000',
+    selectedColor: "#ff0000",
-        backgroundColor: '#ffffff',
+    backgroundColor: "#ffffff",
-        borderStyle: 'white',
+    borderStyle: "white",
     list: [
       {
-                pagePath: 'pages/index/index',
+        pagePath: "pages/index/index",
-                iconPath: 'static/tabbar/1-001.png',
+        iconPath: "static/tabbar/1-001.png",
-                selectedIconPath: 'static/tabbar/1-002.png',
+        selectedIconPath: "static/tabbar/1-002.png",
-                text: '首页'
+        text: "首页",
       },
       // {
       //     pagePath: "pages/category/index",
@@ -83,27 +87,27 @@ export default defineAppConfig({
       //     selectedIconPath: "static/tabbar/2-002.png",
       //     text: "分类",
       // },
-            // {
-            //     pagePath: "pages/cart/index",
-            //     iconPath: "static/tabbar/3-001.png",
-            //     selectedIconPath: "static/tabbar/3-002.png",
-            //     text: "购物车",
-            // },
       {
-                pagePath: 'pages/user/index',
+        pagePath: "pages/cart/index",
-                iconPath: 'static/tabbar/4-001.png',
+        iconPath: "static/tabbar/3-001.png",
-                selectedIconPath: 'static/tabbar/4-002.png',
+        selectedIconPath: "static/tabbar/3-002.png",
-                text: '我的'
+        text: "购物车",
-            }
+      },
-        ]
+      {
+        pagePath: "pages/user/index",
+        iconPath: "static/tabbar/4-001.png",
+        selectedIconPath: "static/tabbar/4-002.png",
+        text: "我的",
+      },
+    ],
   },
   permission: {
-        'scope.userLocation': {
+    "scope.userLocation": {
-            desc: '你的位置信息将用于小程序位置接口的效果展示'
+      desc: "你的位置信息将用于小程序位置接口的效果展示",
-        }
     },
-    requiredBackgroundModes: ['audio', 'location'],
+  },
+  requiredBackgroundModes: ["audio", "location"],
   // @ts-ignore
-    requiredPrivateInfos: ['getLocation'],
+  requiredPrivateInfos: ["getLocation"],
-    lazyCodeLoading: 'requiredComponents'
+  lazyCodeLoading: "requiredComponents",
 });

src/app.scss

@@ -1,22 +1,8 @@
 @import "static/iconfont/iconfont.css";
 
-//@font-face {
-//    font-family: AlibabaPuHuiTi-3-55-Regular;
-//    src: url(https://puhuiti.oss-cn-hangzhou.aliyuncs.com/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular/AlibabaPuHuiTi-3-55-Regular.eot)
-//            format("embedded-opentype"),
-//        url(https://puhuiti.oss-cn-hangzhou.aliyuncs.com/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular/AlibabaPuHuiTi-3-55-Regular.otf)
-//            format("opentype"),
-//        url(https://puhuiti.oss-cn-hangzhou.aliyuncs.com/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular/AlibabaPuHuiTi-3-55-Regular.ttf)
-//            format("TrueType"),
-//        url(https://puhuiti.oss-cn-hangzhou.aliyuncs.com/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular/AlibabaPuHuiTi-3-55-Regular.woff)
-//            format("woff"),
-//        url(https://puhuiti.oss-cn-hangzhou.aliyuncs.com/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-Regular/AlibabaPuHuiTi-3-55-Regular.woff2)
-//            format("woff2");
-//}
-
 page {
-    //font-family: AlibabaPuHuiTi-3-55-Regular, sans-serif;
   background-color: #f5f5f5;
+  font-size: 30rpx;
 }
 
 view {

src/app.ts

@@ -1,9 +1,14 @@
-import {createApp} from 'vue'
+import { createApp } from "vue";
-import './app.scss'
+import "./app.scss";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
+// import * as Sentry from "sentry-miniapp";
 
 // 小程序场景值
-const scenes = [1007, 1008, 1011, 1012, 1013, 1047, 1048, 1049]
+const scenes = [1007, 1008, 1011, 1012, 1013, 1047, 1048, 1049];
+
+// Sentry.init({
+//   dsn: "https://47703e01ba4344b8b252c15e8fd980fd@sentry.io/1528228",
+// });
 
 const App = createApp({
   onLaunch(options: {
@@ -14,49 +19,49 @@ const App = createApp({
     referrerInfo: object | any;
   }) {
     // 检测更新
-        if (Taro.canIUse('getUpdateManager') && options.scene !== 1154) {
+    if (Taro.canIUse("getUpdateManager") && options.scene !== 1154) {
-            const updateManager = Taro.getUpdateManager()
+      const updateManager = Taro.getUpdateManager();
       updateManager.onCheckForUpdate(function (res) {
         if (res.hasUpdate) {
           updateManager.onUpdateFailed(function () {
             return Taro.showToast({
-                            title: '新版本下载失败',
+              title: "新版本下载失败",
-                            icon: 'none'
+              icon: "none",
-                        })
+            });
-                    })
+          });
           updateManager.onUpdateReady(function () {
             Taro.showModal({
-                            title: '更新提示',
+              title: "更新提示",
-                            content: '新版本已经下载好，是否重启当前应用？',
+              content: "新版本已经下载好，是否重启当前应用？",
               success(res) {
                 if (res.confirm) {
-                                    updateManager.applyUpdate()
+                  updateManager.applyUpdate();
                 }
-                            }
+              },
-                        })
+            });
-                    })
+          });
           updateManager.onUpdateFailed(function () {
             Taro.showModal({
-                            title: '发现新版本',
+              title: "发现新版本",
-                            content: '请删除当前小程序，重启搜索打开...'
+              content: "请删除当前小程序，重启搜索打开...",
-                        })
+            });
-                    })
+          });
         }
-            })
+      });
     }
   },
   onShow() {
-        const options = Taro.getCurrentInstance().router as any
+    const options = Taro.getCurrentInstance().router as any;
     if (scenes.includes(options.scene)) {
       if (options.query.scene) {
         Taro.showToast({
-                    title: '已检测到推荐人',
+          title: "已检测到推荐人",
-                    icon: 'none'
+          icon: "none",
-                })
+        });
-                Taro.setStorageSync('bind_id', options.query.scene)
+        Taro.setStorageSync("bind_id", options.query.scene);
       }
     }
-    }
+  },
-})
+});
 
-export default App
+export default App;

src/components/Cart.vue

@@ -0,0 +1,289 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import Taro from "@tarojs/taro";
+import { addCart, getCart, clearCart } from "@/api/cart";
+import { Del2 } from "@nutui/icons-vue-taro";
+import { createActiveOrder } from "@/api/goods";
+import Pay from "@/components/Pay.vue";
+
+interface CardList {
+  name: string;
+  cover: string;
+  bid: string;
+  gid: string;
+  number: string;
+  price: number;
+  exchange: number;
+}
+
+const show = ref(false);
+
+const props = defineProps({
+  merInfo: {
+    required: true,
+    type: Object,
+  },
+});
+
+const emit = defineEmits(["updateCart"]);
+
+const openModal = async () => {
+  await get_cart_list();
+  if (card_list.value.length === 0) return;
+  show.value = !show.value;
+};
+
+const add_cart = async (item: CardList, num: number = 1) => {
+  try {
+    const res = await addCart({
+      Bid: item.bid,
+      Gid: item.gid,
+      Number: Number(num),
+    });
+    Taro.showToast({
+      title: res.msg,
+      icon: "none",
+    });
+    await get_cart_list();
+  } catch (e) {
+    Taro.showToast({
+      title: e.msg,
+      icon: "none",
+    });
+  }
+};
+
+const onAdd = async (item: CardList) => {
+  await add_cart(item, Number(item.number) + 1);
+};
+
+const onReduce = async (item: CardList) => {
+  await add_cart(item, Number(item.number) - 1);
+  if (card_list.value.length === 0) show.value = false;
+};
+
+const card_list = ref<CardList[]>([]);
+
+const cartInfo = ref({
+  count: 0,
+  price: 0,
+  exchange: 0,
+});
+
+const get_cart_list = async () => {
+  try {
+    const res = await getCart({
+      Bid: props.merInfo.bid,
+    });
+    card_list.value = res.data.data || [];
+    cartInfo.value = {
+      count: 0,
+      price: 0,
+      exchange: 0,
+    };
+    card_list.value.forEach((item: CardList) => {
+      cartInfo.value.count += Number(item.number);
+      cartInfo.value.price += Number(item.price);
+      cartInfo.value.exchange += Number(item.exchange);
+    });
+    emit("updateCart", res.data.data || []);
+  } catch (e) {
+    Taro.showToast({
+      title: e.msg,
+      icon: "none",
+    });
+  }
+};
+
+const clear_cart = async () => {
+  try {
+    await clearCart({
+      Bid: props.merInfo.bid,
+    });
+    await get_cart_list();
+  } catch (e) {
+    Taro.showToast({
+      title: e.msg,
+      icon: "none",
+    });
+  }
+  show.value = false;
+};
+
+const isShowPay = ref(false);
+
+const orderData = ref<any>([]);
+
+const closePay = (val: boolean) => {
+  isShowPay.value = val;
+  orderData.value = [];
+  Taro.redirectTo({
+    url: "/pages/users/order_list/index?type=0",
+  });
+};
+
+const create_order = async () => {
+  try {
+    const { data: res } = await createActiveOrder({
+      Bid: [props.merInfo.bid],
+    });
+    if (res.oid) {
+      orderData.value = res.oid;
+      isShowPay.value = true;
+    }
+  } catch (e) {
+    Taro.showToast({
+      title: e.msg,
+      icon: "none",
+    });
+  }
+  // await get_cart_list();
+};
+
+defineExpose({
+  add_cart,
+  get_cart_list,
+});
+</script>
+
+<template>
+  <view>
+    <view class="cart" @click.stop="openModal">
+      <view class="container">
+        <view>购物车数量: {{ cartInfo.count }}</view>
+        <view v-if="cartInfo.count > 0">
+          <text>总金额: {{ cartInfo.price.toFixed(2) }}</text
+          >,
+          <text>总积分: {{ cartInfo.exchange.toFixed(2) }}</text>
+        </view>
+      </view>
+      <view v-if="cartInfo.count > 0" class="payBtn" @click.stop="create_order"
+        >立即结算</view
+      >
+    </view>
+    <!--  购物车弹窗  -->
+    <nut-popup
+      :style="{ padding: '20rpx' }"
+      round
+      position="bottom"
+      z-index="1"
+      :catch-move="true"
+      :safe-area-inset-bottom="true"
+      v-model:visible="show"
+    >
+      <view class="list-header">
+        <view class="left" @click.stop="clear_cart">
+          <Del2 color="#666666" />
+          <text style="color: #666666">清空购物车</text>
+        </view>
+      </view>
+      <scroll-view :scroll-y="true" class="cart-list">
+        <view class="item" v-for="(item, index) in card_list" :key="index">
+          <view class="left">
+            <image :src="item.cover" />
+            <view class="center">
+              <view class="name">{{ item.name }}</view>
+              <view class="price">
+                <view>现金:{{ item.price }}</view>
+                <view>积分:{{ item.exchange }}</view>
+              </view>
+            </view>
+          </view>
+          <nut-input-number
+            v-model="item.number"
+            readonly
+            :min="-1"
+            @add="() => onAdd(item)"
+            @reduce="() => onReduce(item)"
+          />
+        </view>
+      </scroll-view>
+      <view style="height: 140rpx"></view>
+    </nut-popup>
+    <!-- 支付 -->
+    <Pay
+      :is-show-pay="isShowPay"
+      v-model:jfInfo="orderData"
+      @closePay="closePay"
+      @successPay="closePay"
+    />
+  </view>
+</template>
+
+<style lang="scss">
+$h-border-radius: 50rpx;
+
+.cart {
+  position: fixed;
+  bottom: 50rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 9999;
+  width: 95%;
+  background-color: red;
+  border-radius: $h-border-radius;
+  color: #fff;
+  height: 100rpx;
+
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .container {
+    margin-left: 30rpx;
+  }
+
+  .payBtn {
+    width: 180rpx;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    background-color: #000;
+    border-radius: 0 $h-border-radius $h-border-radius 0;
+  }
+}
+
+.list-header {
+  margin: 15rpx 0;
+
+  .left {
+    display: flex;
+    align-items: center;
+  }
+}
+
+.cart-list {
+  height: 290rpx;
+
+  .item {
+    display: flex;
+    align-items: flex-end;
+    margin-bottom: 10rpx;
+    justify-content: space-between;
+
+    .left {
+      display: flex;
+
+      image {
+        width: 130rpx;
+        height: 130rpx;
+        border-radius: 10rpx;
+        margin-right: 10rpx;
+      }
+
+      .center {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+        justify-content: space-between;
+
+        .price {
+          color: red;
+          margin-top: 20rpx;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/MerList.vue

@@ -0,0 +1,152 @@
+<template>
+  <view class="goodBox">
+    <view
+      class="good"
+      v-for="item in merdata"
+      :key="item.ID"
+      @click.stop="toMerDetails(item)"
+    >
+      <image :src="item.head_photo" />
+      <view class="good-text-box">
+        <text class="good-text">{{ item.name }}</text>
+        <text style="color: #999"
+          >距离我{{
+            calculateDistance(
+              userLocalNum.t,
+              userLocalNum.l,
+              Number(item.lat),
+              Number(item.lon)
+            )
+          }}
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+import Taro from "@tarojs/taro";
+import { calculateDistance } from "@/utils";
+import { bindParent } from "@/api/user";
+import { getMerList } from "@/api/goods";
+
+const props = defineProps({
+  classId: {
+    type: Number,
+    default: 0,
+  },
+});
+
+Taro.useDidShow(async () => {
+  await get_mer_list();
+  if (Taro.getStorageSync("token") && Taro.getStorageSync("bind_id")) {
+    try {
+      const res = await bindParent({
+        uid: Taro.getStorageSync("bind_id"),
+      });
+      Taro.showToast({
+        title: res.msg,
+      });
+      Taro.removeStorageSync("bind_id");
+    } catch (error) {
+      Taro.removeStorageSync("bind_id");
+      throw error;
+    }
+  }
+});
+
+interface MerData {
+  ID: number;
+  name: string;
+  head_photo: string;
+  lat: string;
+  lon: string;
+}
+
+const merdata = ref<MerData[]>([]);
+
+const userLocalNum = ref({
+  l: 0,
+  t: 0,
+});
+
+const get_mer_list = async () => {
+  Taro.getLocation({
+    type: "wgs84",
+    success: (res) => {
+      userLocalNum.value.l = res.longitude;
+      userLocalNum.value.t = res.latitude;
+    },
+  });
+
+  const res = await getMerList({
+    PageNum: 1,
+    PageSize: 10,
+    class_id: props.classId,
+  });
+  merdata.value = res.data.data;
+};
+
+const toMerDetails = (item: any) => {
+  Taro.setStorageSync("mer_info", item);
+  Taro.navigateTo({
+    url: `/pages/mer/mer_detail/index`,
+  });
+};
+</script>
+
+<style lang="scss">
+.goodBox {
+  display: flex;
+  padding: 20px;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  .good {
+    width: 340px;
+    background-color: #fff;
+    margin-bottom: 20px;
+    border-radius: 10px;
+
+    image {
+      width: 100%;
+      height: 250px;
+      border-top-right-radius: 10px;
+      border-top-left-radius: 10px;
+    }
+
+    .good-text-box {
+      padding: 10px;
+
+      .good-text {
+        flex-shrink: 0;
+        font-size: 28px;
+        color: #333;
+        font-weight: 400;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        overflow: hidden;
+        word-break: break-word;
+      }
+
+      .good-price-box {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 10px;
+
+        .good-text-price {
+          font-size: 28px;
+          font-weight: bold;
+          color: #ff0000;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          overflow: hidden;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/Pay.vue

@@ -11,13 +11,14 @@
   >
     <view class="div">
       <view style="text-align: center">支付方式</view>
-            <nut-cell-group>
+      <nut-cell-group
+        :style="{ margin: interval ? '40rpx 0 150rpx 0' : '40rpx 0' }"
+      >
         <nut-cell
-                    v-if="payType === 'wx'"
           title="微信支付"
           desc="使用微信快捷支付"
           is-link
-                    @click="goPay()"
+          @click="goPay(1)"
         >
           <template v-slot:icon>
             <IconFont
@@ -27,11 +28,10 @@
           </template>
         </nut-cell>
         <nut-cell
-                    v-if="payType === 'jf'"
           title="积分支付"
           :desc="`剩余积分:${info.integral || 0}`"
           is-link
-                    @click="goPay()"
+          @click="goPay(2)"
         >
           <template v-slot:icon>
             <IconFont
@@ -46,68 +46,74 @@
 </template>
 
 <script setup lang="ts">
-import {ref, watch} from 'vue'
+import { ref, watch } from "vue";
-import {IconFont} from '@nutui/icons-vue-taro'
+import { IconFont } from "@nutui/icons-vue-taro";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {payOrder} from '@/api/order'
+import { payOrder } from "@/api/order";
-import {payJfOrder} from '@/api/goods'
+import { getPersonalInfo } from "@/api/user";
-import {getPersonalInfo} from '@/api/user'
 
 const prop = defineProps({
+  interval: {
+    type: Boolean,
+    default: true,
+  },
   isShowPay: {
     required: true,
     type: Boolean,
-        default: false
+    default: false,
-    },
-    payType: {
-        required: true,
-        type: String,
-        default: 'wx'
   },
   jfInfo: {
     type: Object,
     default: () => {
-            return {}
+      return {};
-        }
+    },
-    }
+  },
-})
+  OrderType: {
+    type: Number,
+    default: 1,
+  },
+});
 
-const emit = defineEmits(['closePay', 'successPay'])
+const emit = defineEmits(["closePay", "successPay"]);
 
-const info = ref<{ integral?: any }>({})
+const info = ref<{ integral?: any }>({});
 
 watch(
   () => prop.isShowPay,
   () => {
-        getInfo()
+    getInfo();
   }
-)
+);
 
 const getInfo = async () => {
   try {
-        const res = await getPersonalInfo()
+    const res = await getPersonalInfo();
-        info.value = res.data.data
+    info.value = res.data.data;
   } catch (error) {
     Taro.showToast({
       title: error.msg,
-            icon: 'none'
+      icon: "none",
-        })
+    });
-        throw error
+    throw error;
-    }
   }
+};
 
-const goPay = async () => {
+const goPay = async (type: number) => {
-    console.log(prop.jfInfo)
+  console.log(prop);
   if (!prop.jfInfo)
     return Taro.showToast({
-            title: '未获取到订单信息',
+      title: "未获取到订单信息",
-            icon: 'none'
+      icon: "none",
-        })
+    });
-    if (prop.payType === 'wx') {
   try {
     const { data } = await payOrder({
-                oid: prop.jfInfo.oid
+      oid: prop.jfInfo,
-            })
+      OrderType: prop.OrderType,
+      PayType: type,
+    });
+    if (data.data) {
+      // 1微信支付 2积分支付
+      if (type === 1) {
         Taro.requestPayment({
           timeStamp: data.data.timeStamp,
           nonceStr: data.data.nonceStr,
@@ -116,63 +122,65 @@ const goPay = async () => {
           paySign: data.data.paySign,
           success: function () {
             Taro.showToast({
-                        title: '支付成功',
+              title: "支付成功",
-                        icon: 'success',
+              icon: "success",
-                        duration: 2000
+              duration: 2000,
-                    })
+            });
-                    Taro.navigateTo({
+            emit("successPay", false);
-                        url: '/pages/hotGoods/hot_list/index'
-                    })
           },
           fail: function () {
             Taro.showToast({
-                        title: '支付失败',
+              title: "支付失败",
-                        icon: 'none',
+              icon: "none",
-                        duration: 2000
+              duration: 2000,
-                    })
+            });
+            emit("closePay", false);
+          },
+        });
+      } else {
+        Taro.showToast({
+          title: "支付成功",
+          icon: "success",
+          duration: 2000,
+        });
+        emit("successPay", false);
+      }
+    } else {
+      Taro.showToast({
+        title: "未知异常",
+        icon: "none",
+      });
+      emit("closePay", false);
     }
-            })
-            emit('closePay', false)
   } catch (e) {
     Taro.showToast({
       title: e.msg,
-                icon: 'none'
+      icon: "none",
-            })
+    });
-            throw e
+    // emit("closePay", false);
-        }
+    throw e;
-    } else {
-        const res = await payJfOrder(prop.jfInfo)
-        Taro.showToast({
-            title: res.msg,
-            icon: 'success',
-            duration: 2000
-        })
-        Taro.navigateTo({
-            url: '/pages/users/order_list/index?type=0'
-        })
-        emit('closePay', false)
-    }
   }
+};
 
 const closePay = () => {
   Taro.showToast({
-        title: '取消支付',
+    title: "取消支付",
-        icon: 'none'
+    icon: "none",
-    })
+  });
-    emit('closePay', false)
+  emit("closePay", false);
-}
+};
 </script>
 
 <style lang="scss">
 .nut-popup {
   .nut-popup__container {
-        border-radius: 10px;
+    border-radius: 10rpx;
   }
 }
 
 .div {
-    padding: 20px;
+  padding: 20rpx;
-    // text-align: center;
+  --nut-cell-box-shadow: none;
 
   .nut-cell {
     align-items: center;

src/components/Popup.vue

@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import Taro from "@tarojs/taro";
+import { userSign } from "@/api/user";
+
+const show = ref(false);
+
+Taro.useLoad(async () => {
+  if (Taro.getStorageSync("token")) show.value = true;
+  // const res = await getSignRecord()
+  // console.log(res)
+});
+
+const toSign = async () => {
+  try {
+    await userSign();
+    Taro.showToast({
+      title: "签到成功",
+      icon: "none",
+    });
+  } catch (e) {
+    console.log(e);
+  }
+  show.value = false;
+};
+</script>
+
+<template>
+  <nut-overlay
+    v-model:visible="show"
+    :lock-scroll="true"
+    :close-on-click-overlay="false"
+  >
+    <view class="wrapper">
+      <view @click.stop="toSign">
+        <image class="image" src="../static/index/poppBg.png" />
+      </view>
+      <view @click.stop="show = false">
+        <image class="icon" src="../static/index/close.png" />
+      </view>
+    </view>
+  </nut-overlay>
+</template>
+
+<style lang="scss">
+.wrapper {
+  display: flex;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.image {
+  width: 500px;
+  height: 600px;
+}
+
+.icon {
+  width: 80px;
+  height: 80px;
+}
+</style>

src/components/RichEditor.vue

@@ -124,116 +124,115 @@
 </template>
 
 <script lang="ts" setup>
-import {reactive} from 'vue'
+import { reactive } from "vue";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {BASE_URL} from '@/utils/request'
+import { BASE_URL } from "@/utils/request";
 
 const { content } = defineProps<{
   content: string;
-}>()
+}>();
 
-let emits = defineEmits(['input'])
+let emits = defineEmits(["input"]);
 
 const data = reactive<any>({
-  editorCtx: '',
+  editorCtx: "",
   readOnly: false,
-  placeholder: '请输入商品详情...',
+  placeholder: "请输入商品详情...",
-  richText: '',
+  richText: "",
-  formats: {}
+  formats: {},
-})
+});
 
 function onEditorReady() {
   // 富文本节点渲染完成
-  Taro
+  Taro.createSelectorQuery()
-      .createSelectorQuery()
+    .select("#editor")
-      .select('#editor')
     .context((res) => {
-        data.editorCtx = res.context
+      data.editorCtx = res.context;
       // 初始化数据
       if (content) {
         data.editorCtx.setContents({
-            html: content
+          html: content,
-          })
+        });
       }
     })
-      .exec()
+    .exec();
 }
 
 // 失去焦点时，获取富文本的内容
-function getCtx(e: { detail: { html: any; }; }) {
+function getCtx(e: { detail: { html: any } }) {
-  data.richText = e.detail.html
+  data.richText = e.detail.html;
-  emits('input', e.detail.html)
+  emits("input", e.detail.html);
 }
 
 // 撤销操作
 function undo() {
-  data.editorCtx.undo()
+  data.editorCtx.undo();
 }
 
 // 复原操作
 function redo() {
-  data.editorCtx.redo()
+  data.editorCtx.redo();
 }
 
 //修改样式
-function format(e: { target: { dataset: { name: any; value: any; }; }; }) {
+function format(e: { target: { dataset: { name: any; value: any } } }) {
   // console.log("format", e.target.dataset);
-  let {name, value} = e.target.dataset
+  let { name, value } = e.target.dataset;
-  if (!name) return
+  if (!name) return;
-  data.editorCtx.format(name, value)
+  data.editorCtx.format(name, value);
 }
 
 //通过 Context 方法改变编辑器内样式时触发，返回选区已设置的样式
-function onStatusChange(e: { detail: any; }) {
+function onStatusChange(e: { detail: any }) {
-  data.formats = e.detail
+  data.formats = e.detail;
 }
 
 // 插入分割线
 function insertDivider() {
-  data.editorCtx.insertDivider()
+  data.editorCtx.insertDivider();
 }
 
 // 插入图片
 function insertImage() {
   Taro.chooseImage({
     count: 1,
-    sizeType: ['original', 'compressed'],
+    sizeType: ["original", "compressed"],
-    sourceType: ['album', 'camera'],
+    sourceType: ["album", "camera"],
     success: (res) => {
       // 上传图片的逻辑各有不同，自行调整即可
       Taro.uploadFile({
         url: `${BASE_URL}/upload`,
-        name: 'file',
+        name: "file",
-        header: {token: Taro.getStorageSync('token')},
+        header: { token: Taro.getStorageSync("token") },
         filePath: res.tempFilePaths[0],
         success: (res) => {
-          console.log(res)
+          console.log(res);
           const imgData = JSON.parse(res.data) as {
             code: number;
             msg: string;
             data: any;
-          }
+          };
           if (imgData.code === 200) {
             // 将图片展示在编辑器中
             data.editorCtx.insertImage({
-              width: '100%',
+              width: "100%",
-              height: 'auto',
+              height: "auto",
               src: imgData.data.data,
-              alt: '图像',
+              alt: "图像",
               success: function () {
-                console.log('insert image success')
+                console.log("insert image success");
-              }
+              },
-            })
+            });
           } else {
-            console.log('上传失败')
+            console.log("上传失败");
           }
         },
         fail: (err) => {
-          console.log(err)
+          console.log(err);
-        }
+        },
-      })
+      });
-    }
+    },
-  })
+  });
 }
 </script>
 

src/components/Upload.vue

@@ -12,52 +12,52 @@
 </template>
 
 <script setup lang="ts">
-import {BASE_URL} from '@/utils/request'
+import { BASE_URL } from "@/utils/request";
-import {computed, ref} from 'vue'
+import { computed, ref } from "vue";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
 
 const props = defineProps({
   list: {
     type: Array,
-        default: () => []
+    default: () => [],
   },
   max: {
     type: Number,
-        default: 1
+    default: 1,
   },
   multiple: {
     type: Boolean,
-        default: false
+    default: false,
-    }
+  },
 });
 
-const emits = defineEmits(['update:list'])
+const emits = defineEmits(["update:list"]);
 
 const fileList = computed({
   get: () => props.list,
-    set: (val) => emits('update:list', val)
+  set: (val) => emits("update:list", val),
 });
 
 const config = ref({
   url: `${BASE_URL}/upload`,
   headers: {
-        token: Taro.getStorageSync('token')
+    token: Taro.getStorageSync("token"),
   },
 });
 
 const success = (res: any) => {
-    const data = JSON.parse(res.responseText.data)
+  const data = JSON.parse(res.responseText.data);
-    res.fileItem.url = data.data.data
+  res.fileItem.url = data.data.data;
   Taro.showToast({
-        title: '上传成功',
+    title: "上传成功",
-        icon: 'success'
+    icon: "success",
   });
 };
 
 const failure = () => {
   Taro.showToast({
-        title: '上传失败',
+    title: "上传失败",
-        icon: 'error'
+    icon: "error",
   });
 };
 </script>

src/components/UserModal.vue

@@ -37,7 +37,6 @@ const closeAttr = () => {
 
 const onChooseAvatar = (e) => {
   const { avatarUrl } = e.detail;
-    console.log(avatarUrl);
   Taro.uploadFile({
     url: `${BASE_URL}/upload`,
     filePath: avatarUrl,
@@ -177,11 +176,7 @@ const formSubmit = async (e: any) => {
                   open-type="getPhoneNumber"
                   @getphonenumber="getPhoneNumber"
                 >
-                                    {{
+                  {{ !userInfo.phone ? "请授权手机号" : "授权成功" }}
-                                        !userInfo.phone
-                                            ? "请授权手机号"
-                                            : "授权成功"
-                                    }}
                 </button>
               </view>
             </view>
@@ -189,12 +184,7 @@ const formSubmit = async (e: any) => {
         </view>
 
         <view class="bottom">
-                    <nut-button
+          <nut-button formType="submit" block type="success" color="#07C160">
-                        formType="submit"
-                        block
-                        type="success"
-                        color="#07C160"
-                    >
             保存
           </nut-button>
         </view>

src/index.html

@@ -1,15 +1,20 @@
 <!DOCTYPE html>
 <html>
   <head>
-  <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-  <meta content="width=device-width,initial-scale=1,user-scalable=no" name="viewport">
+    <meta
-  <meta name="apple-mobile-web-app-capable" content="yes">
+      content="width=device-width,initial-scale=1,user-scalable=no"
-  <meta name="apple-touch-fullscreen" content="yes">
+      name="viewport"
-  <meta name="format-detection" content="telephone=no,address=no">
+    />
-  <meta name="apple-mobile-web-app-status-bar-style" content="white">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
+    <meta name="apple-touch-fullscreen" content="yes" />
+    <meta name="format-detection" content="telephone=no,address=no" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="white" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <title>taroApp</title>
-  <script><%= htmlWebpackPlugin.options.script %></script>
+    <script>
+      <%= htmlWebpackPlugin.options.script %>
+    </script>
   </head>
   <body>
     <div id="app"></div>

src/pages/admin/order_manage/detail/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '订单详情'
+  navigationBarTitleText: "订单详情",
-  })
+});

src/pages/admin/order_manage/detail/index.vue

@@ -17,14 +17,8 @@
     </view>
     <nut-cell-group>
       <nut-cell title="订单状态:" :desc="orderStatus"></nut-cell>
-            <nut-cell
+      <nut-cell title="下单用户:" :desc="info.BindUser?.nickName"></nut-cell>
-                title="下单用户:"
+      <nut-cell title="用户手机号:" :desc="info.BindUser?.phone"></nut-cell>
-                :desc="info.BindUser?.nickName"
-            ></nut-cell>
-            <nut-cell
-                title="用户手机号:"
-                :desc="info.BindUser?.phone"
-            ></nut-cell>
       <nut-cell
         v-if="info.status === 2"
         title="核销人员:"
@@ -41,7 +35,7 @@
 
 <script setup lang="ts">
 import Taro from "@tarojs/taro";
-import { ref, computed } from "vue";
+import { ref } from "vue";
 
 const info = ref<any>({});
 
@@ -49,7 +43,7 @@ Taro.useLoad(() => {
   info.value = Taro.getStorageSync("ver_order_info");
 });
 
-const orderStatus = computed(() => {
+const orderStatus = () => {
   switch (info.value.status) {
     case 1:
       return "待核销";
@@ -58,7 +52,7 @@ const orderStatus = computed(() => {
     case 3:
       return "已失效";
   }
-});
+};
 </script>
 
 <style lang="scss">

src/pages/admin/order_manage/index.config.ts

@@ -1,4 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '订单管理'
+  navigationBarTitleText: "订单管理",
-  })
+});
-  

src/pages/admin/order_manage/index.vue

@@ -36,9 +36,7 @@
           hover-class="none"
           :url="`/pages/admin/statistics/index?type=price&time=today`"
         >
-                    <view class="title">{{
+          <view class="title">{{ orderInfo?.total?.TodayNumber || 0 }}</view>
-                        orderInfo?.total?.TodayNumber || 0
-                    }}</view>
           <view class="sub">今日成交额</view>
         </navigator>
         <navigator
@@ -56,9 +54,7 @@
           hover-class="none"
           :url="`/pages/admin/statistics/index?type=price&time=month`"
         >
-                    <view class="title">{{
+          <view class="title">{{ orderInfo?.total?.MonthNumber || 0 }}</view>
-                        orderInfo?.total?.MonthNumber || 0
-                    }}</view>
           <view class="sub">本月成交额</view>
         </navigator>
         <navigator
@@ -66,9 +62,7 @@
           hover-class="none"
           :url="`/pages/admin/statistics/index?type=order&time=today`"
         >
-                    <view class="title">{{
+          <view class="title">{{ orderInfo?.total?.TodayOrder || 0 }}</view>
-                        orderInfo?.total?.TodayOrder || 0
-                    }}</view>
           <view class="sub">今日订单数</view>
         </navigator>
         <navigator
@@ -76,9 +70,7 @@
           hover-class="none"
           :url="`/pages/admin/statistics/index?type=order&time=yesterday`"
         >
-                    <view class="title">{{
+          <view class="title">{{ orderInfo?.total?.YesterdayOrder || 0 }}</view>
-                        orderInfo?.total?.YesterdayOrder || 0
-                    }}</view>
           <view class="sub">昨日订单数</view>
         </navigator>
         <navigator
@@ -86,9 +78,7 @@
           hover-class="none"
           :url="`/pages/admin/statistics/index?type=order&time=month`"
         >
-                    <view class="title">{{
+          <view class="title">{{ orderInfo?.total?.MonthOrder || 0 }}</view>
-                        orderInfo?.total?.MonthOrder || 0
-                    }}</view>
           <view class="sub">本月订单数</view>
         </navigator>
       </view>
@@ -152,11 +142,9 @@ const columns = ref([
 ]);
 
 const getData = async () => {
-    const mer_type = Taro.getStorageSync("mer_type");
   const user_info = Taro.getStorageSync("userInfo");
   const res = await orderStatistics({
-        bid: user_info.bid,
+    bid: user_info.data.bid,
-        type: mer_type,
   });
   orderInfo.value = res.data;
 };

src/pages/admin/order_manage/list/index.config.ts

@@ -1,4 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '订单列表'
+  navigationBarTitleText: "订单列表",
-  })
+});
-  

src/pages/admin/order_manage/list/index.vue

@@ -26,9 +26,7 @@
         <view class="top">
           <view class="name">订单号:{{ item.oid }}</view>
           <!-- <view class="sub">下单时间：{{ item.add_time }}</view> -->
-                    <view class="sub"
+          <view class="sub">核销时间：{{ item.cancel_time || "待核销" }}</view>
-                        >核销时间：{{ item.cancel_time || "待核销" }}</view
-                    >
           <!-- <view style="color: red">{{
                         item.status === 0
                             ? "待付款"
@@ -40,24 +38,26 @@
                     }}</view> -->
         </view>
         <view class="line"></view>
-                <view class="center">
+        <view class="center" v-for="(itm, idx) in item.OrderGoods" :key="idx">
           <view class="top">
-                        <image :src="item.BindGoods.cover" />
+            <image :src="itm.Goods.cover" />
-                        <view class="title">{{ item.BindGoods.name }} </view>
+            <view class="title">{{ itm.Goods.name }} </view>
             <view class="right">
-                            <view>{{ item.number }}</view>
+              <view>{{ itm.pay_price }}元</view>
-                            <view>x{{ item.count }}</view>
+              <view>{{ itm.pay_integral }}积分</view>
+              <view>x{{ itm.number }}</view>
             </view>
           </view>
-                    <!-- <view
-                        class="bom"
-                        style="text-align: right; font-size: 13px"
-                    >
-                        共{{ item.count }}件商品,实付积分:
-                        <text style="color: red">{{ item.number }}</text>
-                    </view> -->
         </view>
         <view class="line"></view>
+        <view class="bom" style="text-align: right">
+          共{{ item.count }}件商品,支付方式:{{
+            item.pay_type === 1 ? "微信" : "积分"
+          }},实付:
+          <text style="color: red">{{
+            item.pay_type === 1 ? item.price : item.exchange
+          }}</text>
+        </view>
       </view>
     </view>
     <nut-empty v-else description="暂无订单数据"></nut-empty>
@@ -67,7 +67,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import Taro from "@tarojs/taro";
-import { getJfOrderList, getActiveOrderList } from "../../../../api/admin";
+import { getActiveOrderList } from "../../../../api/admin";
 
 const opt = ref([
   {
@@ -103,18 +103,12 @@ Taro.useLoad((options) => {
 
 const getData = async () => {
   try {
-        const mer_type = Taro.getStorageSync("mer_type");
     const user_info = Taro.getStorageSync("userInfo");
-        let res: any = null;
     const data = {
-            bid: user_info.bid,
+      bid: user_info.data.bid,
       status: tabVal.value,
     };
-        if (mer_type === 1) {
+    const res = await getActiveOrderList(data);
-            res = await getActiveOrderList(data);
-        } else {
-            res = await getJfOrderList(data);
-        }
     dataList.value = res.data.data;
   } catch (error) {
     Taro.showToast({

src/pages/admin/statistics/index.vue

@@ -43,9 +43,7 @@
       <view class="title">
         {{ title }}{{ where.type == 1 ? "营业额" : "订单量" }}
       </view>
-            <view v-if="where.type == 1" class="money">{{
+      <view v-if="where.type == 1" class="money">{{ dataObj.all || 0 }}</view>
-                dataObj.all || 0
-            }}</view>
       <view v-else class="money">{{ dataObj.all || 0 }}</view>
       <view class="increase">
         <view>
@@ -56,9 +54,7 @@
             <text
               class="iconfont"
               :class="
-                                dataObj.growthRate >= 0
+                dataObj.growthRate >= 0 ? 'icon-xiangshang1' : 'icon-xiangxia2'
-                                    ? 'icon-xiangshang1'
-                                    : 'icon-xiangxia2'
               "
             ></text
           ></text>
@@ -250,11 +246,9 @@ const setChooseValue = (ref: any) => {
 
 const getData = async () => {
   try {
-        const mer_type = Taro.getStorageSync("mer_type");
     const user_info = Taro.getStorageSync("userInfo");
     const res = await growthRate({
-            bid: user_info.bid,
+      bid: user_info.data.bid,
-            type: mer_type,
       status: where.value.status,
       StartTime: where.value.start,
       EndTime: where.value.end,

src/pages/admin/verify/index.vue

@@ -1,9 +1,7 @@
 <template>
   <view>
     <view class="card">
-            <nut-button block type="primary" @click="scanCode"
+      <nut-button block type="primary" @click="scanCode">扫码核销</nut-button>
-                >扫码核销</nut-button
-            >
     </view>
   </view>
 </template>
@@ -33,9 +31,8 @@ const scanCode = () => {
     scanType: ["qrCode"],
     success: async (res) => {
       try {
-                const mer_type = JSON.parse(Taro.getStorageSync("mer_type"));
         Taro.navigateTo({
-                    url: `/pages/admin/verify/verify_list/index?oid=${res.result}&mer_type=${mer_type}`,
+          url: `/pages/admin/verify/verify_list/index?oid=${res.result}`,
         });
       } catch (error) {
         Taro.showToast({

src/pages/admin/verify/verify_list/index.vue

@@ -3,24 +3,29 @@
     <view class="card">
       <view>订单号：{{ goodInfo.oid }}</view>
       <view class="line"></view>
-            <view class="container">
+      <view
-                <image
+        class="container"
-                    class="image"
+        v-for="(item, index) in goodInfo.OrderGoods"
-                    :src="goodInfo.cover"
+        :key="index"
-                    mode="widthFix"
+      >
-                ></image>
+        <image class="image" :src="item.Goods.cover" mode="widthFix"></image>
         <view class="info">
-                    <view class="title">{{ goodInfo.goods_name }}</view>
+          <view class="title">商品名称：{{ item.Goods.name }}</view>
           <view class="num"
-                        >数量:
+            >数量: <text style="color: red">{{ item.number }}</text></view
-                        <text style="color: red">{{
-                            goodInfo.count
-                        }}</text></view
           >
         </view>
         <view></view>
       </view>
       <view class="line"></view>
+      <text>支付方式：{{ goodInfo.pay_type === 1 ? "微信" : "积分" }}</text
+      >，
+      <text
+        >总计：{{
+          goodInfo.pay_type === 1 ? goodInfo.price : goodInfo.exchange
+        }}</text
+      >
+      <view class="line"></view>
       <view class="cz">
         <nut-button size="small" type="primary" @click="subVerify"
           >确定核销</nut-button
@@ -32,12 +37,7 @@
 
 <script setup lang="ts">
 import Taro from "@tarojs/taro";
-import {
+import { getActiveVerifyList, activeOrderVerify } from "@/api/admin";
-    getJfVerifyList,
-    getActiveVerifyList,
-    activeOrderVerify,
-    orderVerify,
-} from "@/api/admin";
 import { ref } from "vue";
 
 const opt = ref<any>({});
@@ -50,16 +50,9 @@ Taro.useLoad((options) => {
 const goodInfo = ref<any>({});
 
 const getData = async (options: any) => {
-    let res;
+  const res = await getActiveVerifyList({
-    if (Number(options.mer_type) === 1) {
-        res = await getActiveVerifyList({
     oid: options.oid,
   });
-    } else {
-        res = await getJfVerifyList({
-            oid: options.oid,
-        });
-    }
   if (!res.data.data.oid) {
     Taro.showToast({
       title: "没有此订单",
@@ -76,16 +69,9 @@ const getData = async (options: any) => {
 
 const subVerify = async () => {
   try {
-        let res;
+    const res = await activeOrderVerify({
-        if (Number(opt.value.mer_type) === 1) {
-            res = await activeOrderVerify({
       oid: goodInfo.value.oid,
     });
-        } else {
-            res = await orderVerify({
-                oid: goodInfo.value.oid,
-            });
-        }
     Taro.showToast({
       title: res.msg,
       icon: "none",
@@ -117,8 +103,8 @@ const subVerify = async () => {
     display: flex;
 
     image {
-            width: 200px;
+      width: 150rpx;
-            height: 100%;
+      height: 150rpx;
       border-radius: 7px;
       display: block;
     }

src/pages/admin/withdrawal/index.vue

@@ -1,65 +1,83 @@
 <script lang="ts" setup>
-import {ref, h} from 'vue'
+import { ref, h } from "vue";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {getWithdrawList, addWithdraw} from '@/api/admin'
+import { getWithdrawList, addWithdraw } from "@/api/admin";
 
-const user_info = Taro.getStorageSync('userInfo')
+const user_info = Taro.getStorageSync("userInfo");
 
-const row = ref(0)
+const row = ref(0);
 
 const basicData = ref({
-  num: ''
+  num: "",
-})
+});
 
-const showPreview = ref(false)
+const showPreview = ref(false);
 
-const imgData = ref([{
+const imgData = ref([
-  src: ''
+  {
-}])
+    src: "",
+  },
+]);
 
 const columns = ref([
   {
-    title: '时间',
+    title: "时间",
-    key: 'add_time',
+    key: "add_time",
-    align: 'center'
+    align: "center",
-  }, {
-    title: '提现金额',
-    key: 'integral',
-    align: 'center',
-    render: (row: { integral: number; }) => {
-      return h('view', {}, row.integral / 100)
-    }
   },
   {
-    title: '审核状态',
+    title: "提现金额",
-    key: 'status',
+    key: "integral",
-    align: 'center',
+    align: "center",
-    render: (row: { status: number; }) => {
+    render: (row: { integral: number }) => {
-      return h('view', {
+      return h("view", {}, row.integral / 100);
-        class: `tag ${row.status === 1 ? 'success' : row.status === 2 ? 'danger' : 'warning'}`
+    },
-      }, {
-        default: () => row.status === 1 ? '已打款' : row.status === 2 ? '已拒绝' : '待审核'
-      })
-    }
   },
   {
-    title: '备注',
+    title: "审核状态",
-    key: 'img',
+    key: "status",
-    align: 'center',
+    align: "center",
-    render: (row: { status_img: string; }) => {
+    render: (row: { status: number }) => {
-      return h('img', {
+      return h(
-        class: 'image',
+        "view",
+        {
+          class: `tag ${
+            row.status === 1
+              ? "success"
+              : row.status === 2
+              ? "danger"
+              : "warning"
+          }`,
+        },
+        {
+          default: () =>
+            row.status === 1
+              ? "已打款"
+              : row.status === 2
+              ? "已拒绝"
+              : "待审核",
+        }
+      );
+    },
+  },
+  {
+    title: "备注",
+    key: "img",
+    align: "center",
+    render: (row: { status_img: string }) => {
+      return h("img", {
+        class: "image",
         onClick: () => {
-          imgData.value[0].src = row.status_img
+          imgData.value[0].src = row.status_img;
-          showPreview.value = true
+          showPreview.value = true;
         },
-        src: row.status_img
+        src: row.status_img,
-      })
+      });
-    }
+    },
-  }
+  },
-])
+]);
 
-const data = ref([])
+const data = ref([]);
 
 const pagination = ref({
   page: 1,
@@ -67,61 +85,67 @@ const pagination = ref({
   showPageSize: 5,
   totalItems: 0,
   change: (page: number) => {
-    pagination.value.page = page
+    pagination.value.page = page;
-    getData()
+    getData();
-  }
+  },
-})
+});
 
 const hideFn = () => {
-  showPreview.value = false
+  showPreview.value = false;
-}
+};
 
 Taro.useLoad(() => {
-  getData()
+  getData();
-})
+});
 
 const getData = async () => {
   try {
     const res = await getWithdrawList({
       PageNum: pagination.value.page,
       PageSize: pagination.value.showPageSize,
-      Bid: user_info.bid
+      Bid: user_info.bid,
-    })
+    });
-    data.value = res.data.data || []
+    data.value = res.data.data || [];
-    pagination.value.totalItems = res.data.total
+    pagination.value.totalItems = res.data.total;
-    row.value = res.data.integral || 0
+    row.value = res.data.integral || 0;
-    console.log(res)
+    console.log(res);
   } catch (e) {
-    throw e
+    throw e;
-  }
   }
+};
 
 const add = async () => {
   try {
-    if (Number(basicData.value.num) === 0) return Taro.showToast({
+    if (Number(basicData.value.num) === 0)
-      title: '提现积分需大于0',
+      return Taro.showToast({
-      icon: 'none'
+        title: "提现积分需大于0",
-    })
+        icon: "none",
+      });
     const res = await addWithdraw({
       Bid: user_info.bid,
-      Number: Number(basicData.value.num)
+      Number: Number(basicData.value.num),
-    })
+    });
     Taro.showToast({
       title: res.msg,
-      icon: 'none'
+      icon: "none",
-    })
+    });
-    await getData()
+    await getData();
   } catch (e) {
-    throw e
+    throw e;
-  }
   }
+};
 </script>
 
 <template>
   <view>
     <nut-form>
       <nut-form-item label="提现积分：">
-        <nut-input v-model="basicData.num" class="nut-input-text" placeholder="请输入提现积分" type="text"/>
+        <nut-input
+          v-model="basicData.num"
+          class="nut-input-text"
+          placeholder="请输入提现积分"
+          type="text"
+        />
       </nut-form-item>
       <nut-form-item>
         <view>
@@ -141,9 +165,15 @@ const add = async () => {
     <view v-if="data.length > 0">
       <view class="data">
         <nut-table :columns="columns" :data="data"></nut-table>
-        <nut-pagination class="pagination" v-model="pagination.page" :total-items="pagination.totalItems"
+        <nut-pagination
-                        :items-per-page="pagination.itemsPerPage" :show-page-size="pagination.showPageSize"
+          class="pagination"
-                        @change="pagination.change" :bordered="false"/>
+          v-model="pagination.page"
+          :total-items="pagination.totalItems"
+          :items-per-page="pagination.itemsPerPage"
+          :show-page-size="pagination.showPageSize"
+          @change="pagination.change"
+          :bordered="false"
+        />
       </view>
     </view>
     <nut-empty v-else description="暂无提现记录"></nut-empty>
@@ -153,7 +183,6 @@ const add = async () => {
 </template>
 
 <style lang="scss">
-
 .text-red {
   color: red;
 }

src/pages/cart/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '购物车'
+  navigationBarTitleText: "购物车",
-})
+});

src/pages/cart/index.vue

@@ -1,117 +1,292 @@
 <template>
   <view>
     <view v-if="list.length > 0">
-      <nut-swipe v-for="(item,index) in list" :key="index">
+      <nut-cell-group v-for="(itm, idx) in list" :key="idx">
-        <view class="item">
+        <nut-cell>
-          <nut-checkbox v-model="item.checkbox" @click="select">{{ item.ID }}</nut-checkbox>
+          <nut-checkbox
-          <image src="https://s2.loli.net/2023/08/16/6KgdSQa4WRoT3sz.jpg"
+            v-model="itm.state.checkbox"
-                 style="width: 100px;height: 100px"/>
+            :indeterminate="itm.state.indeterminate"
-          <view class="text">
+            @change="(val: boolean) => changeBoxAll(val,idx)"
+            >{{ itm.StoreName }}
+          </nut-checkbox>
+        </nut-cell>
+        <nut-checkbox-group
+          v-model="itm.state.checkboxgroup"
+          :ref="(el) => getGroup(el, idx)"
+          @change="(label) => changeBox(label, itm)"
+        >
+          <nut-cell v-for="(item, idx1) in itm.Goods" :key="idx1">
+            <nut-checkbox :label="item.gid" style="width: 10%"></nut-checkbox>
+            <view class="box">
+              <view class="box-left">
+                <img class="cover" :src="item.cover" alt="" />
+                <view class="center">
                   <view>{{ item.name }}</view>
-            <view class="bom">
+                  <view class="price">
-              <nut-price :price="item.number" size="normal" :need-symbol="false"/>
+                    <view>{{ item.price }} 元</view>
-              <nut-input-number readonly @add="select()" @reduce="select()"
+                    <view>{{ item.exchange }} 积分</view>
-                                v-model="item.count"/>
                   </view>
                 </view>
               </view>
-        <template #right>
+              <nut-input-number
-          <nut-button shape="square" style="height:100%" type="danger">删除</nut-button>
+                v-model="item.number"
-        </template>
+                readonly
-      </nut-swipe>
+                :min="-1"
+                @add.stop="() => onAdd(item)"
+                @reduce.stop="() => onReduce(item)"
+              />
             </view>
-    <nut-empty v-else description="购物车暂无数据">
+          </nut-cell>
-      <!--      <nut-button icon="refresh" type="primary" @click="toPage()">去兑换商品</nut-button>-->
+        </nut-checkbox-group>
-    </nut-empty>
+      </nut-cell-group>
+    </view>
+    <nut-empty v-else description="购物车暂无数据"></nut-empty>
     <view>
-      <view style="height: 100px"></view>
+      <view style="height: 100rpx"></view>
     </view>
     <view class="bottom-box">
       <view class="left">
-        <nut-checkbox v-model="selectAllVal" @change="selectAll">全选</nut-checkbox>
+        <!-- <nut-checkbox v-model="selectAllVal" @change="selectAll"
+          >全选
+        </nut-checkbox> -->
+        <view>
           <view class="text-box">
-          总计积分：
+            总金额：
-          <nut-price v-model:price="localCount" size="normal" :need-symbol="false"/>
+            <nut-price
+              v-model:price="localCount.price"
+              size="normal"
+              :need-symbol="false"
+            />
+          </view>
+          <view class="text-box">
+            总积分：
+            <nut-price
+              v-model:price="localCount.exchange"
+              size="normal"
+              :need-symbol="false"
+            />
+          </view>
         </view>
       </view>
       <nut-button type="primary" @click="sub">去结算</nut-button>
     </view>
+    <!-- 支付 -->
+    <Pay
+      :is-show-pay="isShowPay"
+      :interval="true"
+      v-model:jfInfo="orderData"
+      @closePay="closePay"
+    />
   </view>
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue'
+import { nextTick, ref } from "vue";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {getCartList} from '@/api/goods'
+import { addCart, getAllCart } from "@/api/cart";
+import { createActiveOrder } from "@/api/goods";
+import Pay from "@/components/Pay.vue";
 
-const selectAllVal = ref(false)
+interface CardList {
+  name: string;
+  cover: string;
+  bid: string;
+  gid: string;
+  number: string;
+  price: number;
+  exchange: number;
+}
 
-const list = ref([])
+// const selectAllVal = ref(false);
 
-const localCount = ref(0)
+interface List {
+  StoreName: string;
+  Goods: CardList[];
+  state: {
+    checkbox: boolean;
+    indeterminate: boolean;
+    checkboxgroup: string[];
+  };
+}
+
+const list = ref<List[]>([]);
+
+const groupList = ref(new Map());
+
+const localCount = ref({
+  price: 0,
+  exchange: 0,
+});
+
+const getGroup = (el: any, idx: number) => {
+  return groupList.value.set(idx, el);
+};
+
+const changeBoxAll = async (value: boolean, idx: number) => {
+  await nextTick(() => {
+    groupList.value.get(idx).toggleAll(value);
+  });
+};
+
+const changeBox = (label: string[], item: any) => {
+  localCount.value = {
+    price: 0,
+    exchange: 0,
+  };
+
+  item["Count"] = {
+    priceCount: 0,
+    exchangeCount: 0,
+  };
+
+  if (label.length > 0) {
+    label.forEach((id: string) => {
+      item.Goods.forEach((itm: any) => {
+        if (itm.gid === id) {
+          item["Count"].priceCount += itm.price * itm.number;
+          item["Count"].exchangeCount += itm.exchange * itm.number;
+        }
+      });
+    });
+  }
+
+  list.value.forEach((item: any) => {
+    localCount.value.price += item.Count.priceCount;
+    localCount.value.exchange += item.Count.exchangeCount;
+  });
+
+  if (label.length === item.Goods.length) {
+    item.state.checkbox = true;
+    item.state.indeterminate = false;
+  } else if (label.length && label.length < item.Goods.length) {
+    item.state.indeterminate = true;
+  } else {
+    item.state.indeterminate = false;
+    item.state.checkbox = false;
+  }
+};
 
 Taro.useDidShow(() => {
-  getList()
+  getList();
-})
+});
 
-const select = () => {
+// const selectAll = () => {
-  localCount.value = 0
+//   localCount.value = {
-  list.value.forEach((item: any) => {
+//     price: 0,
-    if (item.checkbox) {
+//     exchange: 0,
-      setTimeout(() => {
+//   };
-        item.countNum = Number(item.number) * Number(item.count)
+//   groupList.value.forEach((item: any) => {
-        localCount.value += item.countNum
+//     item.toggleAll(selectAllVal.value);
-        console.log(localCount.value)
+//   });
-      }, 1)
+//   list.value.forEach((item: any) => {
-      selectAllVal.value = true
+//     if (item.state.checkboxgroup.length > 0) {
-    } else {
+//       item.Goods.forEach((itm: any) => {
-      selectAllVal.value = false
+//         localCount.value.price += itm.price;
-    }
+//         localCount.value.exchange += itm.exchange;
-  })
+//       });
-}
+//     }
+//   });
+// };
 
-const selectAll = () => {
+const isShowPay = ref(false);
-  localCount.value = 0
+const orderData = ref<any>([]);
-  list.value.forEach((item: any) => {
-    item.checkbox = selectAllVal.value
-  })
-  select()
-  console.log(list.value)
-}
 
-const sub = () => {
+const sub = async () => {
-  const arr = list.value.filter((item: any) => item.checkbox)
+  const arr: any = list.value.filter(
+    (item: any) => item.state.checkboxgroup.length > 0
+  );
   if (arr.length === 0) {
     Taro.showToast({
-      title: '请选择商品',
+      title: "请选择商品",
-      icon: 'none'
+      icon: "none",
-    })
+    });
-    return
+    return;
   }
 
+  try {
+    const { data: res } = await createActiveOrder({
+      Bid: arr.map((item: any) => item.StoreBid),
+    });
+    if (res.oid) {
+      orderData.value = res?.oid;
+      isShowPay.value = true;
+    }
+  } catch (e) {
+    Taro.showToast({
+      title: e.msg,
+      icon: "none",
+    });
+  }
+};
+
+const closePay = async (val: boolean) => {
+  isShowPay.value = val;
+  orderData.value = [];
+  await getList();
   Taro.navigateTo({
-    url: '/pages/goods/order_create/index'
+    url: "/pages/users/order_list/index?type=0",
-  })
+  });
-}
+};
-
 
 const getList = async () => {
-  const res = await getCartList()
+  localCount.value = {
-  list.value = res.data.data.Goods.map((item: any) => {
+    price: 0,
-    return {
+    exchange: 0,
+  };
+  const res = await getAllCart();
+  list.value = res.data.data || [];
+  if (list.value.length > 0) {
+    list.value = list.value.map((item: any) => ({
       ...item,
-      count: 1,
+      Goods: item.Goods.sort(
-      countNum: item.number,
+        (a: CardList, b: CardList) => Number(a.gid) - Number(b.gid)
-      checkbox: false
+      ),
-    }
+      state: {
-  })
+        indeterminate: false,
+        checkbox: false,
+        checkboxgroup: [],
+      },
+      Count: {
+        priceCount: 0,
+        exchangeCount: 0,
+      },
+    }));
   }
+};
 
-const toPage = () => {
+// const toPage = () => {
-  Taro.switchTab({
+//   Taro.switchTab({
-    url: '/pages/index/index'
+//     url: "/pages/index/index",
-  })
+//   });
+// };
+
+const onAdd = async (item: CardList) => {
+  await add_cart(item, Number(item.number) + 1);
+};
+
+const onReduce = async (item: CardList) => {
+  await add_cart(item, Number(item.number) - 1);
+};
+
+const add_cart = async (item: CardList, num: number = 1) => {
+  try {
+    const res = await addCart({
+      Bid: item.bid,
+      Gid: item.gid,
+      Number: Number(num),
+    });
+    Taro.showToast({
+      title: res.msg,
+      icon: "none",
+    });
+    await getList();
+  } catch (e) {
+    Taro.showToast({
+      title: e.msg,
+      icon: "none",
+    });
   }
+};
 </script>
 
 <style lang="scss">
@@ -122,33 +297,34 @@ const toPage = () => {
   text-align: center;
 }
 
-.item {
+.box {
-  margin-top: 10px;
-  padding: 20px;
-  background-color: white;
-  display: flex;
-  justify-items: center;
-  justify-content: space-between;
   width: 100%;
-  box-sizing: border-box;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
 
-  image {
+  .box-left {
-    width: 200px;
+    display: flex;
-    height: 150px;
+    align-items: center;
+
+    .cover {
+      width: 130rpx;
+      height: 130rpx;
+      margin-right: 15rpx;
+      border-radius: 20rpx;
     }
 
-  .text {
+    .center {
-    width: 60%;
-    margin-left: 20px;
       display: flex;
       flex-direction: column;
-    padding: 20px;
+      justify-content: space-around;
-    justify-content: space-between;
 
-    .bom {
+      .price {
         display: flex;
-      justify-content: space-between;
+        flex-direction: column;
-      align-items: center;
+        color: red;
+      }
     }
   }
 }
@@ -160,23 +336,22 @@ const toPage = () => {
   bottom: 0;
   left: 0;
   width: 100%;
-  height: 100px;
+  height: 100rpx;
-  z-index: 999;
+  z-index: 9999;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 0 20px;
+  padding: 0 20rpx;
-  box-shadow: 100px 104px 288px rgba(0, 0, 0, 0.01);
+  box-shadow: 100rpx 104rpx 288rpx rgba(0, 0, 0, 0.01);
+  border-top: 1rpx solid #f5f5f5;
 
   .left {
     display: flex;
     align-items: center;
 
     .text-box {
-      margin-left: 10px;
+      margin-left: 10rpx;
     }
   }
-
-
 }
 </style>

src/pages/category/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '分类'
+  navigationBarTitleText: "分类",
-})
+});

src/pages/category/index.vue

@@ -26,17 +26,13 @@
               <view class="name">{{ item.name }}</view>
               <view class="bom">
                 <view class="price"
-                                    ><text style="font-size: 15px">{{
+                  ><text style="font-size: 15px">{{ item.number }}</text>
-                                        item.number
-                                    }}</text>
                   积分</view
                 >
                 <nut-button
                   size="mini"
                   type="primary"
-                                    @click.stop="
+                  @click.stop="toGoodDetails(item.gid as number)"
-                                        toGoodDetails(item.gid as number)
-                                    "
                   >去兑换</nut-button
                 >
               </view>

src/pages/game/gamehome/index.vue

@@ -11,8 +11,8 @@ import { useLoad, getStorageSync } from "@tarojs/taro";
 const url = ref("");
 
 useLoad(() => {
-    const user = getStorageSync("userInfo");
+  // const user = getStorageSync("userInfo");
-    url.value = `${process.env.TARO_APP_GAME}${user.uid}`;
+  url.value = `${process.env.TARO_APP_GAME}${getStorageSync("token")}`;
 });
 </script>
 

src/pages/game/gameview/index.vue

@@ -12,7 +12,7 @@ import { WebView } from "@tarojs/components";
 
 const gameUrl = ref("");
 
-const user = ref({})
+const user = ref({});
 
 useLoad(() => {
   user.value = getStorageSync("userInfo");

src/pages/goods/goods_detail/index.config.ts

@@ -1,4 +1,4 @@
 export default definePageConfig({
-    navigationBarTitleText: '商品详情',
+  navigationBarTitleText: "商品详情",
-    navigationStyle: 'custom',
+  navigationStyle: "custom",
-  })
+});

src/pages/goods/goods_detail/index.vue

@@ -20,20 +20,31 @@
     <!-- 标题价格 -->
     <view class="card">
       <view class="header">
+        <view class="price">
           <nut-price
-                    size="large"
+            size="normal"
             :price="goodInfo.number as number"
             position="after"
-                    :symbol="payType === 'jf' ? '积分' : '元'"
+            symbol="元"
+          />
+          <nut-price
+            size="normal"
+            :price="goodInfo.exchange as number"
+            position="after"
+            symbol="积分"
           />
-                <view class="stock">
-                    库存剩余:{{ goodInfo.stock }}
         </view>
+
+        <view class="stock"> 库存剩余:{{ goodInfo.stock }}</view>
       </view>
       <view class="title">{{ goodInfo.name }}</view>
       <view class="sub">{{ goodInfo.profile }}</view>
+      <nut-button size="small" type="primary" @click.stop="add_cart(goodInfo)">
+        <template #icon>
+          <Cart2 />
+        </template>
+      </nut-button>
     </view>
-        <nut-cell title="请选择规格: " is-link @click="openSku"></nut-cell>
     <!-- 产品介绍 -->
     <view class="rich-box">
       <view class="title">产品介绍</view>
@@ -46,271 +57,114 @@
     </view>
     <view style="height: 9vh"></view>
     <!-- 底部 -->
-        <view class="bottom-box">
+    <!--  购物车  -->
-            <view class="left">
+    <cart ref="cartRef" :mer-info="mer_info" @update-cart="updateCartNum" />
-                <view class="icon" @click="toPage('/pages/index/index')">
-                    <Home/>
-                    <view>首页</view>
-                </view>
-                <!--        <view-->
-                <!--            class="icon"-->
-                <!--            v-if="payType === 'jf'"-->
-                <!--            @click="toPage('/pages/cart/index')"-->
-                <!--        >-->
-                <!--          <Cart/>-->
-                <!--          <view>购物车</view>-->
-                <!--        </view>-->
-                <view class="icon" @click="toPage('/pages/kefu/index', 2)">
-                    <My/>
-                    <view>客服</view>
-                </view>
-            </view>
-            <!-- 占位 -->
-
-            <view style="width: 80%">
-                <!--                <nut-button-->
-                <!--                    v-if="payType === 'jf'"-->
-                <!--                    style="margin-right: 10px"-->
-                <!--                    type="warning"-->
-                <!--                    @click="add_cart()"-->
-                <!--                    >加入购物车-->
-                <!--                </nut-button>-->
-                <nut-button type="primary" block @click="toOrderDetail()"
-                >{{ payType === 'jf' ? '立即兑换' : '立即购买' }}
-                </nut-button>
-            </view>
-        </view>
-        <!-- 规格选择 -->
-        <nut-popup
-            position="bottom"
-            overlay-class="overlay"
-            safe-area-inset-bottom
-            closeable
-            round
-            :style="{ zIndex: 1 }"
-            v-model:visible="isSkuShow"
-        >
-            <view class="sku-box">
-                <view>商品规格</view>
-                <nut-cell-group>
-                    <nut-cell title="数量:">
-                        <template v-slot:link>
-                            <nut-input-number
-                                v-model="count"
-                                @change="addCount"
-                                button-size="30"
-                            />
-                        </template>
-                    </nut-cell>
-                </nut-cell-group>
-            </view>
-        </nut-popup>
-        <!-- <nut-sku
-        v-model:visible="isSkuShow"
-        :sku="sku"
-        :goods="goods"
-        @selectSku="selectSku"
-        @clickBtnOperate="clickBtnOperate"
-        @close="close"
-    ></nut-sku> -->
-        <Pay
-            :is-show-pay="isShowPay"
-            :pay-type="payType"
-            v-model:jfInfo="orderData"
-            @closePay="closePay"
-        />
   </view>
 </template>
 
 <script setup lang="ts">
-const statusBarHeight = Taro.getSystemInfoSync()?.statusBarHeight
+import { Ref, ref } from "vue";
-import {ref} from 'vue'
+import Taro from "@tarojs/taro";
-import Taro from '@tarojs/taro'
+import { Home, Left } from "@nutui/icons-vue-taro";
-import {Home, Left, My} from '@nutui/icons-vue-taro'
+import { getActiveGoodsDetail } from "@/api/goods";
-import {createActiveOrder, createOrder, getActiveGoodsDetail, getGoodsDetail} from '@/api/goods'
+import Cart from "@/components/Cart.vue";
-import Pay from '@/components/Pay.vue'
+import { Cart2 } from "@nutui/icons-vue-taro";
+import { nextTick } from "vue";
 
-const BarHeight = ref((statusBarHeight as number) + 7)
+const statusBarHeight = Taro.getSystemInfoSync()?.statusBarHeight;
+const BarHeight = ref((statusBarHeight as number) + 7);
 
-const swiperList = ref([])
+const swiperList = ref([]);
-
-const isSkuShow = ref(false)
-
-const isShowPay = ref(false)
-
-// const sku = ref([]);
-
-const payType = ref('')
-
-const orderData = ref([])
-
-const count = ref(1)
 
 interface GoodInfo {
-    gid?: number;
+  gid?: string;
   name?: string;
   number?: number;
+  exchange?: number;
   cover?: string;
   details?: string;
   sku?: any[];
   stock?: number;
   profile?: string;
+  price?: number;
+  cartNum?: number;
 }
 
-const goodInfo = ref<GoodInfo>({})
+const goodInfo = ref<GoodInfo>({});
 
-Taro.useLoad((options) => {
+Taro.useLoad(async (options) => {
-    payType.value = options.type === '1' ? 'wx' : 'jf'
+  await get_good_detail(options.gid);
-    get_good_detail(options.gid)
+  mer_info.value = Taro.getStorageSync("mer_info");
-})
+  await nextTick(async () => {
+    await cartRef.value.get_cart_list();
+  });
+});
 
 const get_good_detail = async (gid: string) => {
   try {
-        let res: any
+    const res = await getActiveGoodsDetail({ gid: gid });
-        if (payType.value === 'jf') {
-            res = await getGoodsDetail({gid: gid})
-        } else {
-            res = await getActiveGoodsDetail({gid: gid})
-        }
     goodInfo.value = {
-            ...res.data.data
+      ...res.data.data,
       // details: res.data.data.details.,
-        }
+    };
-
+    swiperList.value = res.data.data.rotation.split(",");
-        swiperList.value = res.data.data.rotation.split(',')
   } catch (e) {
     Taro.showToast({
       title: e.msg,
-            icon: 'none'
+      icon: "none",
-        })
+    });
-    }
-}
-
-const addCount = () => {
-    if (count.value >= (goodInfo.value.stock as number)) {
-        count.value = goodInfo.value.stock as number
-        Taro.showToast({
-            title: '库存不足',
-            icon: 'none'
-        })
-        return
-    }
   }
+};
 
 const returns = () => {
   Taro.navigateBack({
-        delta: 1
+    delta: 1,
-    })
+  });
-}
+};
 
 const goHome = () => {
   Taro.switchTab({
-        url: '/pages/index/index'
+    url: "/pages/index/index",
-    })
+  });
+};
+
+interface CartItems {
+  bid: string;
+  gid: string;
+  number: number;
+  price: number;
+  cover: string;
+  name: string;
+  exchange: number;
 }
 
-const openSku = () => {
+const mer_info = ref<any>({});
-    isSkuShow.value = true
-}
 
-// const selectSku = () => {};
+const cartRef = ref(null) as Ref;
-// const clickBtnOperate = () => {};
-// const close = () => {};
-// const add_cart = async () => {
-//     if (isSkuShow.value === false) return openSku();
-//     try {
-//         await addCart({ gid: goodInfo.value.gid });
-//         Taro.showToast({
-//             title: "加入购物车成功",
-//             icon: "success",
-//             duration: 2000,
-//         });
-//     } catch (e) {
-//         Taro.showToast({
-//             title: e.msg,
-//             icon: "none",
-//         });
-//     }
-//     isSkuShow.value = false;
-// };
 
-const toOrderDetail = async () => {
+const add_cart = async (item: any) => {
-    if (!Taro.getStorageSync('token')) {
+  const num = item.cartNum ? Number(item.cartNum) + 1 : 1;
-        return Taro.showModal({
+  await nextTick(async () => {
-            title: '提示',
+    await cartRef.value.add_cart(item, num);
-            content: '你还没登录,请先登录',
+  });
-            cancelText: '先逛逛',
+};
-            confirmText: '去登录',
+
-            success: (res) => {
+const updateCartNum = (cartItems: CartItems[]) => {
-                if (res.confirm) {
+  if (cartItems.length > 0) {
-                    Taro.reLaunch({
+    cartItems.forEach((cartItem: CartItems) => {
-                        url: '/pages/users/login/index'
+      if (goodInfo.value.gid === cartItem.gid) {
-                    })
+        goodInfo.value.cartNum = cartItem.number;
       }
-            }
+    });
-        })
-    }
-    if (isSkuShow.value === false) return openSku()
-    // Taro.navigateTo({
-    //   url: '/pages/goods/order_create/index'
-    // })
-    try {
-        let res: any
-        if (payType.value === 'jf') {
-            res = await createOrder([
-                {
-                    gid: goodInfo.value.gid,
-                    count: Number(count.value)
-                }
-            ])
   } else {
-            res = await createActiveOrder({
+    Reflect.deleteProperty(goodInfo.value, "cartNum");
-                gid: goodInfo.value.gid,
-                stock: Number(count.value)
-            })
-        }
-
-        orderData.value = res?.data?.data
-
-        isShowPay.value = true
-
-        count.value = 1
-    } catch (e) {
-        Taro.showToast({
-            title: e.msg,
-            icon: 'none'
-        })
-    }
-
-    isSkuShow.value = false
-}
-
-const closePay = (val: boolean) => {
-    isShowPay.value = val
-    orderData.value = []
-}
-
-const toPage = (url: string, type: number = 1) => {
-    if (type === 1) {
-        Taro.switchTab({
-            url: url
-        })
-    } else {
-        // Taro.navigateTo({
-        //     url: url,
-        // });
-        Taro.showToast({
-            title: '暂未开放',
-            icon: 'none'
-        })
-    }
   }
+};
 </script>
 
 <style lang="scss">
 page {
   --nut-cell-box-shadow: none;
-    // --nut-cell-padding: 0;
   --nut-cell-title-font: 30px;
 }
 
@@ -354,13 +208,18 @@ page {
 .card {
   padding: 30px;
   background-color: #fff;
+  position: relative;
 
   .header {
-
     display: flex;
     justify-content: space-between;
     align-items: center;
 
+    .price {
+      display: flex;
+      flex-direction: column;
+    }
+
     .title {
       font-size: 30px;
       font-weight: bold;
@@ -372,11 +231,17 @@ page {
     }
   }
 
-
   .sub {
     font-size: 24px;
     color: #999;
   }
+
+  .nut-button {
+    // margin: 10px;
+    position: absolute;
+    right: 40rpx;
+    bottom: 20rpx;
+  }
 }
 
 .rich-box {
@@ -395,12 +260,6 @@ page {
 
   .rich {
     width: 100%;
-
-        // img {
-        //     width: 100%;
-        //     height: auto;
-        //     display: block;
-        // }
   }
 }
 
@@ -446,7 +305,6 @@ page {
       color: #333;
       font-size: 25px;
       width: 100px;
-            // margin-right: 100px;
     }
   }
 

src/pages/goods/order_create/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: "提交订单"
+  navigationBarTitleText: "提交订单",
 });

src/pages/goods/order_create/index.vue

@@ -43,10 +43,7 @@
     <!-- 底部 -->
     <view class="bottom-box">
       <view
-                >总计：<nut-price
+        >总计：<nut-price :price="8888.01" position="after" symbol="积分"
-                    :price="8888.01"
-                    position="after"
-                    symbol="积分"
       /></view>
       <nut-button type="primary" @click="orderPay">提交订单</nut-button>
     </view>

src/pages/goods/order_status/index.vue

@@ -2,11 +2,7 @@
   <view>
     <view class="card">
       <view class="icon">
-                <Check
+        <Check font-class-name="nutui-iconfont check" size="70" color="#fff" />
-                    font-class-name="nutui-iconfont check"
-                    size="70"
-                    color="#fff"
-                />
         <!-- <CloseLittle font-class-name="nutui-iconfont check" size="70" color="#fff" /> -->
       </view>
       <view class="text-box">

src/pages/hotGoods/hot_list/index.config.ts

@@ -1,4 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '活动订单',
+  navigationBarTitleText: "活动订单",
-  })
+});
-  

src/pages/hotGoods/hot_list/index.vue

@@ -197,16 +197,11 @@ const delOrder = async (oid: string) => {
       </view>
     </view>
     <view v-if="orderList.length > 0">
-            <view
+      <view class="order-card" v-for="(item, index) in orderList" :key="index">
-                class="order-card"
-                v-for="(item, index) in orderList"
-                :key="index"
-            >
         <view class="top">
-                    <view>{{
+          <view>{{ item.add_time.slice(0, 19).replace("T", " ") }}</view>
-                        item.add_time.slice(0, 19).replace("T", " ")
+          <view style="color: red"
-                    }}</view>
+            >{{
-                    <view style="color: red">{{
               item.status === 0
                 ? "待付款"
                 : item.status === 1
@@ -214,7 +209,8 @@ const delOrder = async (oid: string) => {
                 : item.status === 2
                 ? "已使用"
                 : "已失效"
-                    }}</view>
+            }}
+          </view>
         </view>
         <view class="line"></view>
         <view class="center">

src/pages/hotGoods/index/index.config.ts

@@ -1,4 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '活动商品',
+  navigationBarTitleText: "活动商品",
-  })
+});
-  

src/pages/index/index.config.ts

@@ -1,4 +1,4 @@
 export default definePageConfig({
-    navigationBarTitleText: '首页',
+  navigationBarTitleText: "首页",
-    enableShareAppMessage: true
+  enableShareAppMessage: true,
-})
+});

src/pages/index/index.vue

@@ -9,11 +9,20 @@
     <nut-swiper
       :init-page="0"
       :pagination-visible="true"
-            pagination-color="#426543"
+      pagination-color="#000"
-            auto-play="3000"
+      duration="1000"
+      :loop="false"
     >
       <nut-swiper-item v-for="(itm, idx) in swiperList" :key="idx">
-                <img :alt="itm.ID.toString()" :src="itm.url"/>
+        <view
+          class="item"
+          v-for="(item, index) in itm"
+          :key="index"
+          @click="toDetails(item)"
+        >
+          <image :src="item.icon" />
+          <text>{{ item.name }}</text>
+        </view>
       </nut-swiper-item>
     </nut-swiper>
     <!--  金刚区  -->
@@ -29,145 +38,120 @@
         </nut-grid-item>
       </nut-grid>
     </view>
-        <view class="goodBox">
+    <MerList />
-            <view
+    <!--    签到弹窗    -->
-                class="good"
+    <Popup />
-                v-for="item in (merdata as any)"
-                :key="item.ID"
-                @click.stop="toMerDetails(item)"
-            >
-                <image :src="(item.head_photo as string)"/>
-                <view class="good-text-box">
-                    <text class="good-text">{{ item.name }}</text>
-                    <text style="color: #999"
-                    >距离我{{
-                            calculateDistance(
-                                userLocalNum.t,
-                                userLocalNum.l,
-                                Number(item.lat),
-                                Number(item.lon)
-                            )
-                        }}
-                    </text
-                    >
-                </view>
-            </view>
-        </view>
   </view>
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue'
+import { ref } from "vue";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {bindParent, getBanner} from '@/api/user'
+import Popup from "@/components/Popup.vue";
-import {getMerList} from '@/api/goods'
+import MerList from "@/components/MerList.vue";
-import {calculateDistance} from '@/utils'
+import { getHomeList } from "@/api/home";
 
-const searchValue = ref('')
+const searchValue = ref("");
 
-const swiperList = ref<any>([])
+interface SwiperList {
+  ID: number;
+  icon: string;
+  name: string;
+}
+
+const swiperList = ref<Array<Array<SwiperList>>>([]);
 
 const userMenuList = ref([
   {
     id: 1,
-        label: '活动游戏',
+    label: "活动游戏",
-        url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync('token')}`,
+    url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync("token")}`,
-        icon: 'http://jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png'
+    icon: "//jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png",
   },
   {
     id: 2,
-        label: '活动商品',
+    label: "活动商品",
-        url: '/pages/hotGoods/index/index',
+    // url: "/pages/hotGoods/index/index",
-        icon: 'http://jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png'
+    url: "",
+    icon: "//jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png",
   },
   {
     id: 3,
-        label: '商户入驻',
+    label: "商户入驻",
-        url: '/pages/users/settled_mer/index',
+    url: "/pages/users/settled_mer/index",
-        icon: 'http://jdt168.com/uploads/merchant/20220829/6fe67b93721a42aedc842c4f19d6f2d3.png'
+    icon: "//jdt168.com/uploads/merchant/20220829/6fe67b93721a42aedc842c4f19d6f2d3.png",
   },
   {
     id: 4,
-        label: '最新资讯',
+    label: "最新资讯",
-        url: '',
+    url: "",
-        icon: 'http://jdt168.com/uploads/merchant/20220829/b975136a9b64aab69bf11d75a194f1ea.png'
+    icon: "//jdt168.com/uploads/merchant/20220829/b975136a9b64aab69bf11d75a194f1ea.png",
-    }
+  },
-])
+]);
 
 Taro.useDidShow(async () => {
-    await getBannerList()
+  await getBannerList();
-    await get_mer_list()
+});
-    if (Taro.getStorageSync('token') && Taro.getStorageSync('bind_id')) {
-        try {
-            const res = await bindParent({
-                uid: Taro.getStorageSync('bind_id')
-            })
-            Taro.showToast({
-                title: res.msg
-            })
-            Taro.removeStorageSync('bind_id')
-        } catch (error) {
-            Taro.removeStorageSync('bind_id')
-            throw error
-        }
-    }
-})
 
 Taro.useShareAppMessage(() => ({
-    title: '捷兑通',
+  title: "捷兑通",
-    path: `/pages/index/index?scene=${Taro.getStorageSync('token')}`,
+  path: `/pages/index/index?scene=${Taro.getStorageSync("token")}`,
   imageUrl:
-        'https://upload.jdt168.com/1694242954957988438_微信图片_20230909150016.jpg'
+    "https://upload.jdt168.com/1694242954957988438_微信图片_20230909150016.jpg",
-}))
+}));
-
-const merdata = ref([])
-
-const userLocalNum = ref({
-    l: 0,
-    t: 0
-})
-
-const get_mer_list = async () => {
-    Taro.getLocation({
-        type: 'wgs84',
-        success: (res) => {
-            userLocalNum.value.l = res.longitude
-            userLocalNum.value.t = res.latitude
-        }
-    })
-
-    const res = await getMerList({
-        PageNum: 1,
-        PageSize: 10,
-        Btype: 2,
-        classid: 0
-    })
-    merdata.value = res.data.data
-}
 
 const getBannerList = async () => {
-    const {data}: any = await getBanner()
+  const { data } = await getHomeList();
-    swiperList.value = data.data
+  if (data.data.length > 0) {
+    // for (let i = 0; i < 31; i++) {
+    //   data.data.push({
+    //     ID: i,
+    //     icon: "//jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png",
+    //     name: "活动商品",
+    //   });
+    // }
+    // 数组分组
+    const arr = [];
+    for (let i = 0; i < data.data.length; i += 10) {
+      arr.push(data.data.slice(i, i + 10));
     }
+    swiperList.value = arr;
+  }
+};
 
 const toPage = (url: string) => {
   Taro.navigateTo({
-        url: url
+    url: url,
-    })
+  });
-}
+};
 
-const toMerDetails = (item: any) => {
+const toDetails = (item: SwiperList) => {
-    Taro.setStorageSync('mer_info', item)
   Taro.navigateTo({
-        url: `/pages/mer/mer_detail/index`
+    url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
-    })
+  });
-}
+};
 </script>
 
 <style lang="scss">
-.nut-swiper-item img {
+.nut-swiper {
-    width: 100%;
+  background: #ffffff;
-    height: 350px;
+
+  .nut-swiper-item {
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+
+    .item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      image {
+        width: 100px;
+        height: 100px;
+        border-radius: 50%;
+      }
+    }
+  }
 }
 
 .titleImg {
@@ -193,57 +177,4 @@ const toMerDetails = (item: any) => {
     height: 80px;
   }
 }
-
-.goodBox {
-    display: flex;
-    padding: 20px;
-    flex-wrap: wrap;
-    justify-content: space-between;
-
-    .good {
-        width: 340px;
-        background-color: #fff;
-        margin-bottom: 20px;
-        border-radius: 10px;
-
-        image {
-            width: 100%;
-            height: 250px;
-            border-top-right-radius: 10px;
-            border-top-left-radius: 10px;
-        }
-
-        .good-text-box {
-            padding: 10px;
-
-            .good-text {
-                flex-shrink: 0;
-                font-size: 28px;
-                color: #333;
-                font-weight: 400;
-                display: -webkit-box;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 1;
-                overflow: hidden;
-                word-break: break-word;
-            }
-
-            .good-price-box {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                margin-top: 10px;
-
-                .good-text-price {
-                    font-size: 28px;
-                    font-weight: bold;
-                    color: #ff0000;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 1;
-                    overflow: hidden;
-                }
-            }
-        }
-    }
-}
 </style>

src/pages/marketing/sign/index.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: "每日签到",
+});

src/pages/marketing/sign/index.vue

@@ -0,0 +1,7 @@
+<script setup lang="ts"></script>
+
+<template>
+  <view></view>
+</template>
+
+<style lang="scss"></style>

src/pages/mer/mer_detail/index.vue

@@ -7,10 +7,7 @@
       pagination-color="red"
       auto-play="3000"
     >
-            <nut-swiper-item
+      <nut-swiper-item v-for="(itm, idx) in swiperList" :key="idx">
-                v-for="(itm, idx) in (swiperList as any)"
-                :key="idx"
-            >
         <img
           style="width: 100%; height: 100%"
           :src="itm"
@@ -23,7 +20,7 @@
       <view class="title">{{ mer_info.name }}</view>
       <view class="bom">
         <view class="left">
-                    <view>{{ mer_info.address || '暂无商家地址' }}</view>
+          <view>{{ mer_info.address || "暂无商家地址" }}</view>
           <view class="sub"
             >距你{{
               calculateDistance(
@@ -33,8 +30,7 @@
                 Number(mer_info.lon)
               )
             }}
-                    </view
+          </view>
-                    >
         </view>
         <view class="right">
           <view @click="clickMap">
@@ -49,9 +45,6 @@
       </view>
     </view>
     <!-- 商品列表 -->
-        <!-- <view class="good">
-            <view class="item"></view>
-        </view> -->
     <view class="good-class" v-if="class_list.length > 0">
       <nut-tabs
         v-model="value"
@@ -60,119 +53,98 @@
         title-gutter="5"
         animated-time="0"
         name="tabName"
-                @click="clickTab"
       >
         <nut-tab-pane
-                    v-for="(item, index) in class_list as any[]"
+          v-for="(itm, index) in good_list"
-                    :title="item.name"
+          :key="index"
+          :title="itm.name"
           :pane-key="index"
         >
-                    <view v-if="good_list.length > 0">
+          <view v-if="itm.Goods.length > 0">
-                        <view
+            <view class="list" v-for="(item, index) in itm.Goods" :key="index">
-                            class="list"
+              <view class="item" @click.stop="toGoodDetails(item.gid, 1)">
-                            v-for="(item, index) in good_list as any[]"
+                <image :src="item.cover" lazy-load />
-                            :key="index"
-                        >
-                            <view class="item">
-                                <img :src="item.cover"/>
                 <view class="right">
                   <view class="name">{{ item.name }}</view>
-                                    <view class="stock">
+                  <view class="stock">剩余:{{ item.stock }}</view>
-                                        库存剩余:{{ item.stock }}
-                                    </view>
                   <view class="bom">
-                                        <view class="price"
+                    <view>
-                                        >
+                      <view class="price">
-                                            <text style="font-size: 15px">{{
+                        <text style="font-size: 15px">{{ item.number }}元</text>
-                                                    item.number
+                      </view>
-                                                }}
+                      <view class="price">
-                                            </text>
+                        <text style="font-size: 15px"
-                                            {{
+                          >{{ item.exchange }}积分</text
-                                                mer_info.bType === 1
-                                                    ? '元'
-                                                    : '积分'
-                                            }}
-                                        </view
                         >
+                      </view>
+                    </view>
                     <nut-button
                       size="mini"
-                                            v-if="mer_info.bType === 1"
                       type="primary"
-                                            @click.stop="
+                      @click.stop="add_cart(item)"
-                                                toGoodDetails(
-                                                    item.gid as number,
-                                                    1
-                                                )
-                                            "
-                                        >去购买
-                                        </nut-button
-                                        >
-                                        <nut-button
-                                            size="mini"
-                                            v-else
-                                            type="primary"
-                                            @click.stop="
-                                                toGoodDetails(
-                                                    item.gid as number,
-                                                    2
-                                                )
-                                            "
-                                        >去兑换
-                                        </nut-button
                     >
+                      <template #icon>
+                        <Cart2 />
+                      </template>
+                    </nut-button>
+                  </view>
                 </view>
               </view>
             </view>
           </view>
-                    </view
-                    >
           <nut-empty v-else description="该分类暂无商品"></nut-empty>
+          <view style="height: 180rpx"></view>
         </nut-tab-pane>
       </nut-tabs>
     </view>
     <nut-empty v-else description="该商家暂无商品"></nut-empty>
+    <!--  购物车  -->
+    <cart ref="cartRef" :mer-info="mer_info" @update-cart="updateCartNum" />
   </view>
 </template>
 
 <script setup lang="ts">
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {Find, Locationg3} from '@nutui/icons-vue-taro'
+import { Find, Locationg3 } from "@nutui/icons-vue-taro";
-import {ref} from 'vue'
+import { Ref, ref } from "vue";
-import {calculateDistance} from '@/utils'
+import { calculateDistance } from "@/utils";
-import {getGoodList, getMerCategory} from '@/api/goods'
+import { getGoodList, getMerCategory } from "@/api/goods";
+import Cart from "@/components/Cart.vue";
+import { Cart2 } from "@nutui/icons-vue-taro";
 
-const swiperList = ref([])
+const swiperList = ref([]);
 
-const mer_info = ref<any>({})
+const mer_info = ref<any>({});
 
-const value = ref('0')
+const value = ref("0");
 
 const userLocalNum = ref({
   l: 0,
-    t: 0
+  t: 0,
-})
+});
 
-Taro.useLoad(() => {
+Taro.useLoad(async () => {
   Taro.getLocation({
-        type: 'wgs84',
+    type: "wgs84",
     success: (res) => {
-            userLocalNum.value.l = res.longitude
+      userLocalNum.value.l = res.longitude;
-            userLocalNum.value.t = res.latitude
+      userLocalNum.value.t = res.latitude;
-        }
+    },
-    })
+  });
-    mer_info.value = Taro.getStorageSync('mer_info')
+  mer_info.value = Taro.getStorageSync("mer_info");
   Taro.setNavigationBarTitle({
-        title: mer_info.value.name
+    title: mer_info.value.name,
-    })
+  });
-    swiperList.value = mer_info.value.img.split(',')
+  swiperList.value = mer_info.value.img.split(",");
-    get_class_list()
+  await get_class_list();
-})
+  await cartRef.value.get_cart_list();
+});
 
 const clickPhone = () => {
   Taro.makePhoneCall({
-        phoneNumber: mer_info.value.mobile
+    phoneNumber: mer_info.value.mobile,
-    })
+  });
-}
+};
 
 const clickMap = () => {
   Taro.openLocation({
@@ -180,53 +152,112 @@ const clickMap = () => {
     address: mer_info.value.address,
     latitude: Number(mer_info.value.lat),
     longitude: Number(mer_info.value.lon),
-        scale: 18
+    scale: 18,
-    })
+  });
-}
+};
 
 const class_list = ref<
   Array<{
     ID?: number;
     name?: string;
   }>
->([])
+>([]);
 const get_class_list = async () => {
   const res = await getMerCategory({
-        Bid: mer_info.value.bid
+    Bid: mer_info.value.bid,
-    })
+  });
-    class_list.value = res.data.data || []
+  class_list.value = res.data.data || [];
-    await get_good_list(class_list.value[0].ID as number)
+  await get_good_list(class_list.value[0].ID as number);
+};
+
+// const clickTab = (val: any) => {
+//   get_good_list(class_list.value[val.paneKey].ID as number);
+// };
+
+interface goodList {
+  ID: number;
+  name: string;
+  bid: string;
+  Goods: GoodsType[];
 }
 
-const clickTab = (val: any) => {
+interface GoodsType {
-    get_good_list(class_list.value[val.paneKey].ID as number)
+  gid: string;
+  cover: string;
+  name: string;
+  number: number;
+  stock: number;
+  cartNum: number;
+  exchange: number;
 }
 
-const good_list = ref([])
+interface CartItems {
+  bid: string;
+  gid: string;
+  number: number;
+  price: number;
+  cover: string;
+  name: string;
+  exchange: number;
+}
+
+const good_list = ref<goodList[]>([]);
 const get_good_list = async (id: number) => {
   Taro.showLoading({
-        title: '加载中',
+    title: "加载中",
-        mask: true
+    mask: true,
-    })
+  });
   const res = await getGoodList({
     bid: mer_info.value.bid,
-        BType: mer_info.value.bType,
+    goods_class_id: id,
-        class_id: id,
     status: 1,
-        state: 1
+    state: 1,
-    })
+  });
-    good_list.value = res.data.data || []
+  good_list.value = res.data.data || [];
-    Taro.hideLoading()
+  Taro.hideLoading();
-}
+};
 
-const toGoodDetails = (id: number, type: 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}`,
-    })
+  });
+};
+
+const cartRef = ref(null) as Ref;
+
+const add_cart = (item: GoodsType) => {
+  const num = item.cartNum ? Number(item.cartNum) + 1 : 1;
+  cartRef.value.add_cart(item, num);
+};
+
+const updateCartNum = (cartItems: CartItems[]) => {
+  if (cartItems.length > 0) {
+    good_list.value.forEach((category: goodList) => {
+      category.Goods.forEach((good: GoodsType) => {
+        cartItems.forEach((cartItem: CartItems) => {
+          if (good.gid === cartItem.gid) {
+            good.cartNum = cartItem.number;
           }
+        });
+      });
+    });
+  } else {
+    good_list.value.forEach((category: goodList) => {
+      category.Goods.forEach((good: GoodsType) => {
+        Reflect.deleteProperty(good, "cartNum");
+      });
+    });
+  }
+};
 </script>
 
 <style lang="scss">
+page {
+  // IOS安全区域
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
 .nut-swiper {
   height: 350px;
 }
@@ -277,9 +308,9 @@ const toGoodDetails = (id: number, type: number) => {
     display: flex;
     margin-bottom: 10px;
 
-        img {
+    image {
-            width: 140px;
+      width: 180px;
-            height: 150px;
+      height: 180px;
       border-radius: 10px;
     }
 

src/pages/product/addGoods/index.config.ts

@@ -1,4 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '商品添加/编辑'
+  navigationBarTitleText: "商品添加/编辑",
-})
+});
-  

src/pages/product/addGoods/index.vue

@@ -1,87 +1,103 @@
 <script lang="ts" setup>
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {Ref, ref} from 'vue'
+import { Ref, ref } from "vue";
-import Upload from '../../../components/Upload.vue'
+import Upload from "../../../components/Upload.vue";
-import RichEditor from '../../../components/RichEditor.vue'
+import RichEditor from "../../../components/RichEditor.vue";
-import {addGood} from '@/api/product'
+import { addGood } from "@/api/product";
 
-const ruleForm = ref(null) as Ref
+const ruleForm = ref(null) as Ref;
 
 const basicData = ref({
-    name: '',
+  name: "",
   class_id: null,
   cover: [],
   rotation: [],
-    profile: '',
+  profile: "",
-    details: '',
+  details: "",
   stock: null,
   number: null,
   market_num: null,
-    state: 2
+  state: 2,
-})
+});
 
 const rules = {
-    name: [{
+  name: [
+    {
       required: true,
-        message: '请填写商品名称'
+      message: "请填写商品名称",
-    }],
+    },
-    class_id: [{
+  ],
+  class_id: [
+    {
       required: true,
-        message: '请选择商品分类'
+      message: "请选择商品分类",
-    }],
+    },
-    cover: [{
+  ],
+  cover: [
+    {
       required: true,
-        message: '请上传商品封面',
+      message: "请上传商品封面",
       validator: (value) => {
-            return value.length > 0
+        return value.length > 0;
-        }
+      },
-    }],
+    },
-    rotation: [{
+  ],
+  rotation: [
+    {
       required: true,
-        message: '请上传商品轮播图',
+      message: "请上传商品轮播图",
       validator: (value) => {
-            return value.length > 0
+        return value.length > 0;
-        }
+      },
-    }],
+    },
-    profile: [{
+  ],
+  profile: [
+    {
       required: true,
-        message: '请填写商品名称'
+      message: "请填写商品名称",
-    }],
+    },
-    stock: [{
+  ],
+  stock: [
+    {
       required: true,
-        message: '请填写商品库存'
+      message: "请填写商品库存",
-    }],
+    },
-    number: [{
+  ],
+  number: [
+    {
       required: true,
-        message: '请填写商品价格'
+      message: "请填写商品价格",
-    }],
+    },
-    market_num: [{
+  ],
+  market_num: [
+    {
       required: true,
-        message: '请填写商品市场价'
+      message: "请填写商品市场价",
-    }]
+    },
-}
+  ],
+};
 
-const columnsClass = ref([])
+const columnsClass = ref([]);
 
 Taro.useLoad((options) => {
-    console.log(options)
+  console.log(options);
-})
+});
 
-const openGoodClass = ref(false)
+const openGoodClass = ref(false);
 
 const confirmClass = (val: any) => {
-    console.log(val)
+  console.log(val);
-}
+};
 
 const ok = async () => {
   ruleForm.value.validate().then(({ valid, errors }: any) => {
     if (valid) {
-            console.log('success', basicData.value)
+      console.log("success", basicData.value);
     } else {
-            console.log('error submit!!', errors)
+      console.log("error submit!!", errors);
-        }
-    })
     }
+  });
+};
 </script>
 
 <template>
@@ -91,8 +107,12 @@ const ok = async () => {
       <template v-slot:content>
         <nut-form ref="ruleForm" :model-value="basicData" :rules="rules">
           <nut-form-item label="商品分类:" required prop="class_id">
-                        <nut-input v-model="basicData.class_id" disabled placeholder="请选择商品分类"
+            <nut-input
-                                   @click="openGoodClass = true"/>
+              v-model="basicData.class_id"
+              disabled
+              placeholder="请选择商品分类"
+              @click="openGoodClass = true"
+            />
           </nut-form-item>
           <nut-form-item label="商品封面:" required prop="cover">
             <Upload v-model:list="basicData.cover" />
@@ -101,33 +121,47 @@ const ok = async () => {
             <Upload v-model:list="basicData.rotation" :max="10" />
           </nut-form-item>
           <nut-form-item label="商品名称:" required prop="name">
-                        <nut-input v-model="basicData.name" placeholder="请输入商品名称"
+            <nut-input
+              v-model="basicData.name"
+              placeholder="请输入商品名称"
               type="text"
             />
           </nut-form-item>
           <nut-form-item label="商品价格:" required prop="number">
-                        <nut-input v-model="basicData.number" placeholder="请输入商品价格"
+            <nut-input
+              v-model="basicData.number"
+              placeholder="请输入商品价格"
             />
           </nut-form-item>
           <nut-form-item label="市场价格:" required prop="market_num">
-                        <nut-input v-model="basicData.market_num" placeholder="请输入市场价格"
+            <nut-input
+              v-model="basicData.market_num"
+              placeholder="请输入市场价格"
             />
           </nut-form-item>
           <nut-form-item label="商品库存:" required prop="stock">
-                        <nut-input v-model="basicData.stock" placeholder="请输入商品库存"
+            <nut-input v-model="basicData.stock" placeholder="请输入商品库存" />
-                        />
           </nut-form-item>
           <nut-form-item label="商品简介:" required prop="profile">
             <nut-textarea
               class="textarea"
-                            v-model="basicData.profile" placeholder="请输入商品简介"
+              v-model="basicData.profile"
-                            type="text"/>
+              placeholder="请输入商品简介"
+              type="text"
+            />
           </nut-form-item>
           <nut-form-item label="上架状态:" prop="state">
-                        <nut-switch v-model="basicData.state" :active-value="1" :inactive-value="2"/>
+            <nut-switch
+              v-model="basicData.state"
+              :active-value="1"
+              :inactive-value="2"
+            />
           </nut-form-item>
           <nut-form-item prop="details">
-                        <RichEditor :content="basicData.details" @input="(val) => basicData.details = val"/>
+            <RichEditor
+              :content="basicData.details"
+              @input="(val) => (basicData.details = val)"
+            />
           </nut-form-item>
           <nut-form-item prop="ok">
             <nut-button block type="primary" @click="ok">提交</nut-button>
@@ -136,8 +170,15 @@ const ok = async () => {
       </template>
     </nut-backtop>
     <!--   商品分类     -->
-        <nut-popup position="bottom" v-model:visible="openGoodClass" @close="openGoodClass = false">
+    <nut-popup
-            <nut-picker :columns="columnsClass" title="商品分类" @confirm="confirmClass"
+      position="bottom"
+      v-model:visible="openGoodClass"
+      @close="openGoodClass = false"
+    >
+      <nut-picker
+        :columns="columnsClass"
+        title="商品分类"
+        @confirm="confirmClass"
       ></nut-picker>
     </nut-popup>
   </view>
@@ -151,7 +192,7 @@ const ok = async () => {
 
 .textarea {
   height: 100px;
-    background-color: #FAFAFA;
+  background-color: #fafafa;
   padding: 10px !important;
   border-radius: 10px;
 }

src/pages/product/list/index.config.ts

@@ -1,4 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '商品管理'
+  navigationBarTitleText: "商品管理",
-})
+});
-  

src/pages/search/index.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  enableShareAppMessage: true,
+});

src/pages/search/index.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import Taro from "@tarojs/taro";
+import MerList from "@/components/MerList.vue";
+
+const classId = ref<null | number>(null);
+
+Taro.useLoad((e) => {
+  console.log(e);
+  Taro.setNavigationBarTitle({
+    title: e.name,
+  });
+  classId.value = Number(e.id);
+});
+</script>
+
+<template>
+  <view>
+    <MerList :classId="classId" />
+  </view>
+</template>
+
+<style lang="scss"></style>

src/pages/user/index.config.ts

@@ -1,4 +1,4 @@
 export default definePageConfig({
-  navigationBarTitleText: '个人中心',
+  navigationBarTitleText: "个人中心",
-  navigationStyle: 'custom'
+  navigationStyle: "custom",
-})
+});

src/pages/user/index.vue

@@ -7,17 +7,16 @@
     >
       <view class="user-center-card__header__avatar">
         <nut-avatar size="large">
-          <img :src="userInfo.avatarUrl"/>
+          <img :src="userInfo.data?.avatarUrl" />
         </nut-avatar>
       </view>
       <view class="user-center-card__header__info">
         <view
           class="user-center-card__header__info__name"
           @click="toPage('/pages/users/user_setting/index')"
-        >{{ userInfo.nickName }}
+          >{{ userInfo.data?.nickName }}
-        </view
+        </view>
-        >
+        <view v-if="!userInfo.data?.phone">
-        <view v-if="!userInfo.phone">
           <nut-button
             size="mini"
             open-type="getPhoneNumber"
@@ -28,11 +27,7 @@
       </view>
       <view class="rightIcon">
         <Scan style="margin-right: 20px" @click="scanCode" size="22" />
-        <Setting
+        <Setting style="margin-right: 20px" @click="toSetting" size="22" />
-            style="margin-right: 20px"
-            @click="toSetting"
-            size="22"
-        />
       </view>
     </view>
     <view v-else class="user-center-card__header__transparent">
@@ -44,9 +39,7 @@
         </nut-avatar>
       </view>
       <view class="user-center-card__header__info">
-        <view
+        <view class="user-center-card__header__info__name" @click="clickLogin"
-            class="user-center-card__header__info__name"
-            @click="clickLogin"
           >点击立即登录
         </view>
       </view>
@@ -101,9 +94,9 @@
       <view class="user-center">
         <view>我的服务</view>
         <view class="box">
+          <template v-if="isLogin">
             <view
               class="box-mini"
-              v-if="isLogin"
               v-for="item in userMenuList"
               :key="item.id"
               @click="toPage(item.url)"
@@ -112,16 +105,23 @@
               <IconFont size="40" :name="item.icon"></IconFont>
               <view class="label">{{ item.label }}</view>
             </view>
-          <button v-if="isLogin" class="box-mini" open-type='contact'>
+          </template>
-            <IconFont size="40"
+
-                      name="http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png"></IconFont>
+          <button v-if="isLogin" class="box-mini" open-type="contact">
+            <IconFont
+              size="40"
+              name="http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png"
+            ></IconFont>
             <text class="label">联系客服</text>
           </button>
         </view>
       </view>
 
       <!--  商家管理  -->
-      <view class="mer-box" v-if="userInfo.bid">
+      <view
+        class="mer-box"
+        v-if="userInfo.data?.bid && userInfo.store_status === 1"
+      >
         <nut-grid :gutter="10" :border="false">
           <nut-grid-item
             :border="false"
@@ -176,76 +176,79 @@
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue'
+import { ref } from "vue";
-import {ArrowRight, Setting, IconFont, Scan} from '@nutui/icons-vue-taro'
+import { ArrowRight, Setting, IconFont, Scan } from "@nutui/icons-vue-taro";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import Auth from '@/components/Auth.vue'
+import Auth from "@/components/Auth.vue";
-import {getPersonalInfo, getPhone, bindParent} from '@/api/user'
+import { getPersonalInfo, getPhone, bindParent } from "@/api/user";
 
-const isShowLogin = ref(false)
+const isShowLogin = ref(false);
 
-const isLogin = ref(false)
+const isLogin = ref(false);
 
 interface UserInfo {
+  data?: {
     nickName?: string;
     avatarUrl?: string;
     ID?: string;
     bid?: string;
     phone?: string;
     uid?: string;
+  };
+  store_status?: number;
+  store_name?: string;
 }
 
-const userInfo = ref<UserInfo>({})
+const userInfo = ref<UserInfo>({});
 
 Taro.useDidShow(() => {
-  const token = Taro.getStorageSync('token')
+  const token = Taro.getStorageSync("token");
   if (token) {
-    getUserInfo()
+    getUserInfo();
   }
-})
+});
 
 const cancelLogin = () => {
-  isShowLogin.value = false
+  isShowLogin.value = false;
-}
+};
 
 const getUserInfo = async () => {
   Taro.showLoading({
-    title: '加载中'
+    title: "加载中",
-  })
+  });
-  const res = await getPersonalInfo()
+  const res = await getPersonalInfo();
-  userInfo.value = res.data.data
+  userInfo.value = res.data;
-  Taro.setStorageSync('userInfo', res.data.data)
+  Taro.setStorageSync("userInfo", res.data);
-  Taro.setStorageSync('mer_type', res.data.store_type)
+  isLogin.value = true;
-  isLogin.value = true
+  cancelLogin();
-  cancelLogin()
+  Taro.hideLoading();
-  Taro.hideLoading()
+};
-}
 
 const getphonenumber = async (e: any) => {
   await getPhone({
-    uid: userInfo.value.uid,
+    uid: userInfo.value.data?.uid,
-    code: e.detail.code
+    code: e.detail.code,
-  })
+  });
-  await getUserInfo()
+  await getUserInfo();
-}
+};
 
 const toOrderList = (e: number) => {
-  if (!isLogin)
+  if (!isLogin.value)
     return Taro.showToast({
-      title: '请先登录',
+      title: "请先登录",
-      icon: 'none'
+      icon: "none",
-    })
+    });
   Taro.navigateTo({
-    url: `/pages/users/order_list/index?type=${e}`
+    url: `/pages/users/order_list/index?type=${e}`,
-  })
+  });
-}
+};
 
 const userMenuList = ref([
   {
     id: 1,
-    label: '我的账户',
+    label: "我的账户",
-    url: '/pages/users/account/index',
+    url: "/pages/users/account/index",
-    icon: 'http://jdt168.com/uploads/default/20220829/e819815623276fdbb9a54d685292e5c7.png'
+    icon: "http://jdt168.com/uploads/default/20220829/e819815623276fdbb9a54d685292e5c7.png",
   },
   // {
   //     id: 2,
@@ -255,65 +258,65 @@ const userMenuList = ref([
   // },
   {
     id: 3,
-    label: '我的推广',
+    label: "我的推广",
-    url: '/pages/users/distribution/index',
+    url: "/pages/users/distribution/index",
-    icon: 'http://jdt168.com/uploads/default/20220829/73656833c1d849c050638f9ee9903b9d.png'
+    icon: "http://jdt168.com/uploads/default/20220829/73656833c1d849c050638f9ee9903b9d.png",
   },
   {
     id: 4,
-    label: '关注商家',
+    label: "关注商家",
-    url: '',
+    url: "",
-    icon: 'http://jdt168.com/uploads/default/20220829/13637589cd20785aa21fca1d4f9b26bc.png'
+    icon: "http://jdt168.com/uploads/default/20220829/13637589cd20785aa21fca1d4f9b26bc.png",
-  }
+  },
   // {
   //   id: 5,
   //   label: '联系客服',
   //   url: '',
   //   icon: 'http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png'
   // }
-])
+]);
 
 const toSetting = () => {
   Taro.navigateTo({
-    url: '/pages/users/setting/index'
+    url: "/pages/users/setting/index",
-  })
+  });
-}
+};
 
 const clickLogin = () => {
   // isShowLogin.value = true
   Taro.redirectTo({
-    url: '/pages/users/login/index'
+    url: "/pages/users/login/index",
-  })
+  });
-}
+};
 
 const toPage = (url: string) => {
   Taro.navigateTo({
-    url: url
+    url: url,
-  })
+  });
-}
+};
 
 const scanCode = () => {
   Taro.scanCode({
     onlyFromCamera: true,
-    scanType: ['qrCode'],
+    scanType: ["qrCode"],
     success: async (data) => {
       try {
         await bindParent({
-          uid: data.result
+          uid: data.result,
-        })
+        });
         Taro.showToast({
-          title: '绑定成功',
+          title: "绑定成功",
-          icon: 'none'
+          icon: "none",
-        })
+        });
       } catch (error) {
         Taro.showToast({
           title: error.msg,
-          icon: 'none'
+          icon: "none",
-        })
+        });
-      }
-    }
-  })
       }
+    },
+  });
+};
 </script>
 
 <style lang="scss">
@@ -457,7 +460,6 @@ const scanCode = () => {
       color: #000000;
       background-color: #fff;
       height: 100%;
-
     }
 
     button::after {

src/pages/users/account/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '我的账户'
+  navigationBarTitleText: "我的账户",
-})
+});

src/pages/users/account/index.vue

@@ -1,7 +1,9 @@
 <script lang="ts" setup>
-import { ref } from "vue";
+import { computed, ref } from "vue";
-import { showToast, useLoad, getStorageSync } from "@tarojs/taro";
+import Taro from "@tarojs/taro";
-import { getIntegralDetail, getBeanDetail } from "@/api/user";
+import { getIntegralDetail, getBeanDetail, getGiftRecord } from "@/api/user";
+
+// Taro.setStorageSync("token", "ok_OL66Ej4_lkQKNA0AwxnGwGyXo");
 
 const tabValue = ref(1);
 
@@ -18,8 +20,25 @@ const tabsList = ref([
     title: "豆子明细",
     value: 2,
   },
+  {
+    title: "活动赠送",
+    value: 4,
+  },
 ]);
 
+const computerType = computed(() => {
+  return (val: number) => {
+    switch (val) {
+      case 5:
+        return "注册赠送";
+      case 6:
+        return "签到赠送";
+      case 7:
+        return "系统赠送";
+    }
+  };
+});
+
 const tabChange = (index: number) => {
   tabValue.value = index;
   data.value = [];
@@ -27,13 +46,22 @@ const tabChange = (index: number) => {
   page.value.PageNum = 1;
 };
 
-const data = ref([]);
+interface DataType {
+  goods_name: string;
+  add_time: string;
+  number: number;
+  order_number: number;
+  type: number;
+  oid: string;
+}
+
+const data = ref<DataType[]>([]);
 
 const userInfo = ref<any>({});
 
-useLoad(() => {
+Taro.useLoad(() => {
   getList();
-    userInfo.value = getStorageSync("userInfo");
+  userInfo.value = Taro.getStorageSync("userInfo");
 });
 
 const page = ref({
@@ -57,14 +85,17 @@ const getList = async () => {
     };
     if (tabValue.value === 1 || tabValue.value === 3) {
       res = await getBeanDetail(newData);
-        } else {
+    } else if (tabValue.value === 2) {
-            delete data.Type;
+      // delete data.value.Type;
+      Reflect.deleteProperty(data.value, "Type");
       res = await getIntegralDetail(newData);
+    } else {
+      res = await getGiftRecord(newData);
     }
     data.value = res.data.data || [];
     page.value.ItemCount = res.data.count;
   } catch (error) {
-        showToast({
+    Taro.showToast({
       title: error.msg,
       icon: "none",
     });
@@ -79,10 +110,10 @@ const getList = async () => {
       <view class="info">
         <view class="left">
           <view>
-                        <view class="num">豆子: {{ userInfo.pulse }}</view>
+            <view class="num">豆子: {{ userInfo.data?.pulse }}</view>
           </view>
           <view>
-                        <view class="num">积分: {{ userInfo.integral }}</view>
+            <view class="num">积分: {{ userInfo.data?.integral }}</view>
           </view>
         </view>
         <!-- <image class="img" src="https://picdm.sunbangyan.cn/2023/08/15/ste192.png"/> -->
@@ -103,42 +134,51 @@ const getList = async () => {
     </view>
     <view v-if="data.length > 0">
       <view v-if="tabValue === 1 || tabValue === 3">
-                <view
+        <view class="card-list" v-for="(item, index) in data" :key="index">
-                    class="card-list"
-                    v-for="(item, index) in (data as any[])"
-                    :key="index"
-                >
           <view class="left">
-                        <view>商品：{{ item.goods_name }}</view>
+            <view>订单：{{ item.oid }}</view>
             <view>时间：{{ item.add_time.slice(0, 10) }}</view>
           </view>
           <view class="right">
             <view v-if="tabValue === 1" style="color: green"
-                            >-<text>{{ item.number }}积分</text></view
+              >-
-                        >
+              <text>{{ item.number }}积分</text>
+            </view>
             <view v-if="tabValue === 3" style="color: red"
-                            >+<text>{{ item.number }}</text
+              >+
-                            >积分</view
+              <text>{{ item.number }}</text>
-                        >
+              积分
             </view>
           </view>
         </view>
-            <view v-else>
+      </view>
-                <view
+      <view v-else-if="tabValue === 2">
-                    class="card-list"
+        <view class="card-list" v-for="(item, index) in data" :key="index">
-                    v-for="(item, index) in (data as any[])"
-                    :key="index"
-                >
           <view class="left">
-                        <view class="text">商品：{{ item.goods_name }}</view>
+            <view class="text">订单：{{ item.oid }}</view>
-                        <view>金额：{{ item.order_number }}元</view>
             <view>时间：{{ item.add_time.slice(0, 10) }}</view>
           </view>
           <view class="right">
             <view style="color: red"
-                            >+<text>{{ item.number }}</text
+              >+
-                            >豆子</view
+              <text>{{ item.number }}</text>
-                        >
+              豆子
+            </view>
+          </view>
+        </view>
+      </view>
+      <view v-else-if="tabValue === 4">
+        <view class="card-list" v-for="(item, index) in data" :key="index">
+          <view class="left">
+            <view class="text">类型：{{ computerType(item.type) }}</view>
+            <view>时间：{{ item.add_time.slice(0, 10) }}</view>
+          </view>
+          <view class="right">
+            <view style="color: red"
+              >+
+              <text>{{ item.number }}</text>
+              豆子
+            </view>
           </view>
         </view>
       </view>
@@ -159,6 +199,7 @@ const getList = async () => {
   left: 50%;
   transform: translateX(-50%);
 }
+
 .card {
   width: 90%;
   height: 300px;
@@ -230,6 +271,7 @@ const getList = async () => {
     background-color: #ff0000;
   }
 }
+
 .card-list {
   margin: 10px 20px;
   background-color: #fff;

src/pages/users/bindPhone/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '手机号登录'
+  navigationBarTitleText: "手机号登录",
-})
+});

src/pages/users/bindPhone/index.vue

@@ -115,9 +115,7 @@ const login = async () => {
           </view>
         </nut-form-item>
         <nut-form-item>
-                    <nut-button type="primary" block @click="login"
+          <nut-button type="primary" block @click="login">登录</nut-button>
-                        >登录</nut-button
-                    >
         </nut-form-item>
       </nut-form>
     </view>

src/pages/users/distribution/userlist/index.vue

@@ -12,7 +12,6 @@
             <view>{{ item.nickName }}</view>
             <view>{{ item.phone }}</view>
           </view>
-                    
         </view>
         <view class="right"></view>
       </view>

src/pages/users/login/index.config.ts

@@ -1,4 +1,4 @@
 export default definePageConfig({
-    navigationBarTitleText: '登录',
+  navigationBarTitleText: "登录",
-    navigationStyle: 'custom'
+  navigationStyle: "custom",
-})
+});

src/pages/users/order_list/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '我的订单'
+  navigationBarTitleText: "我的订单",
-})
+});

src/pages/users/order_list/index.vue

@@ -1,16 +1,8 @@
 <script lang="ts" setup>
 import { ref } from "vue";
-import {
+import Taro from "@tarojs/taro";
-    useLoad,
-    useReachBottom,
-    showToast,
-    navigateTo,
-    setStorageSync,
-    useDidShow,
-} from "@tarojs/taro";
 import Pay from "@/components/Pay.vue";
-import { getIntegralOrderList } from "@/api/user";
+import { getActiveOrderList, deleteActiveOrder } from "@/api/goods";
-import { deleteJfOrder } from "@/api/goods";
 import { getOrderStatistics } from "@/api/order";
 
 const tabValue = ref(0);
@@ -51,40 +43,50 @@ interface OrderList {
   oid: string;
   add_time: string;
   status: number;
-    BindGoods: {
+  OrderGoods: GoodsItem[];
-        cover: string;
-        name: string;
-        number: number;
-    };
   count: number;
   number: number;
+  pay_type: number;
+  exchange: number;
+  price: number;
+}
+
+interface GoodsItem {
+  Goods: {
+    name: string;
+    cover: string;
+  };
+  ID: number;
+  gid: string;
+  number: number;
+  oid: string;
+  pay_integral: number;
+  pay_price: number;
 }
 
 const orderList = ref<OrderList[]>([]);
 
-useLoad((options) => {
+Taro.useLoad((options) => {
   tabValue.value = Number(options.type);
 });
 
-useDidShow(() => {
+Taro.useDidShow(() => {
   getList();
 });
 
 const getList = async () => {
   try {
-        const res = await getIntegralOrderList({
+    const res = await getActiveOrderList({
       status: tabValue.value,
     });
-
-        console.log(res);
     orderList.value = res.data.data;
   } catch (error) {
-        showToast({
+    Taro.showToast({
       title: error.msg,
       icon: "none",
     });
   }
-    getTj();
+  await getTj();
 };
 
 const tabChange = (index: number) => {
@@ -92,18 +94,18 @@ const tabChange = (index: number) => {
   getList();
 };
 
-useReachBottom(() => {
+Taro.useReachBottom(() => {
   console.log("useReachBottom");
 });
 
 const openPay = (item: OrderList) => {
   isShowPay.value = true;
-    jfInfo.value = [item];
+  jfInfo.value = item.oid;
 };
 
 const errPay = () => {
   isShowPay.value = false;
-    showToast({
+  Taro.showToast({
     title: "支付失败",
     icon: "none",
   });
@@ -112,7 +114,7 @@ const errPay = () => {
 };
 const closePay = () => {
   isShowPay.value = false;
-    showToast({
+  Taro.showToast({
     title: "支付取消",
     icon: "none",
   });
@@ -121,26 +123,32 @@ const closePay = () => {
 };
 
 const toDetail = (item: any) => {
-    setStorageSync("item", item);
+  Taro.setStorageSync("item", item);
-    navigateTo({
+  Taro.navigateTo({
     url: `/pages/users/order_list_detail/index?orderId=${item.oid}`,
   });
 };
 
 const delOrder = async (oid: string) => {
   try {
-        const res = await deleteJfOrder({ oid });
+    await deleteActiveOrder({ oid });
-        console.log(res);
   } catch (error) {
-        showToast({
+    Taro.showToast({
       title: error.msg,
       icon: "none",
     });
   }
-    getList();
+  await getList();
 };
 
-const countInfo = ref<any>({});
+const countInfo = ref<{
+  A?: number;
+  B?: number;
+  C?: number;
+  D?: number;
+  F?: number;
+  Total?: number;
+}>({});
 
 const getTj = async () => {
   try {
@@ -154,7 +162,7 @@ const getTj = async () => {
     tabsList.value[3].num = countInfo.value.D || 0;
     tabsList.value[4].num = countInfo.value.F || 0;
   } catch (error) {
-        showToast({
+    Taro.showToast({
       title: error.msg,
       icon: "none",
     });
@@ -188,14 +196,11 @@ const getTj = async () => {
       </view>
     </view>
     <view v-if="orderList.length > 0">
-            <view
+      <view class="order-card" v-for="(item, index) in orderList" :key="index">
-                class="order-card"
-                v-for="(item, index) in orderList"
-                :key="index"
-            >
         <view class="top">
           <view>{{ item.add_time.slice(0, 19) }}</view>
-                    <view style="color: red">{{
+          <view style="color: red"
+            >{{
               item.status === 0
                 ? "待付款"
                 : item.status === 1
@@ -203,27 +208,31 @@ const getTj = async () => {
                 : item.status === 2
                 ? "已使用"
                 : "已失效"
-                    }}</view>
+            }}
+          </view>
         </view>
         <view class="line"></view>
-                <view class="center">
+        <view class="center" v-for="(itm, idx) in item.OrderGoods" :key="idx">
           <view class="top">
-                        <image :src="item.BindGoods.cover" />
+            <image :src="itm.Goods.cover" />
-                        <view class="title">{{ item.BindGoods?.name }} </view>
+            <view class="title">{{ itm.Goods?.name }}</view>
             <view class="right">
-                            <view>{{ item.BindGoods?.number }}</view>
+              <view>{{ itm.pay_price }}元</view>
-                            <view>x{{ item?.count }}</view>
+              <view>{{ itm.pay_integral }}积分</view>
+              <view>x{{ itm.number }}</view>
             </view>
           </view>
-                    <!-- <view
-                        class="bom"
-                        style="text-align: right; font-size: 13px"
-                    >
-                        共{{ item.count }}件商品,实付积分:
-                        <text style="color: red">{{ item.number }}</text>
-                    </view> -->
         </view>
         <view class="line"></view>
+        <view v-if="item.status !== 0" style="text-align: right">
+          <text>共{{ item.count }}件商品</text>,
+          <text
+            >实付款:{{ item.pay_type === 1 ? item.price : item.exchange }},{{
+              item.pay_type === 1 ? "微信支付" : "积分支付"
+            }}</text
+          >
+          <view class="line"></view>
+        </view>
         <view class="btn">
           <nut-button
             v-if="item.status === 0"
@@ -254,15 +263,22 @@ const getTj = async () => {
     <nut-empty v-else description="暂无订单"></nut-empty>
     <pay
       :isShowPay="isShowPay"
-            payType="jf"
+      :interval="false"
+      :jfInfo="jfInfo"
+      :OrderType="2"
       @errPay="errPay"
       @closePay="closePay"
-            :jfInfo="jfInfo"
     />
   </view>
 </template>
 
 <style lang="scss">
+page {
+  // IOS安全区域
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
 .topTips {
   box-sizing: border-box;
   width: 100%;
@@ -335,14 +351,16 @@ const getTj = async () => {
   }
 
   .center {
+    margin-bottom: 10px;
     .top {
       display: flex;
       justify-content: space-between;
       // align-items: flex-start;
 
       image {
-                width: 150px;
+        width: 150rpx;
-                height: 150px;
+        height: 150rpx;
+        border-radius: 10rpx;
       }
 
       .title {

src/pages/users/order_list_detail/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '订单详情'
+  navigationBarTitleText: "订单详情",
-})
+});

src/pages/users/order_list_detail/index.vue

@@ -19,12 +19,12 @@
     <view class="mer-info">
       <view class="left">
         <view>
-                    <text>{{ goodInfo.BindStore?.name }}</text>
+          <text>{{ goodInfo.Store?.name }}</text>
-                    <text>{{ goodInfo.BindStore?.phone }}</text>
+          <text>{{ goodInfo.Store?.phone }}</text>
         </view>
         <nut-ellipsis
           :rows="2"
-                    :content="goodInfo.BindStore?.address"
+          :content="goodInfo.Store?.address"
           direction="end"
         ></nut-ellipsis>
       </view>
@@ -45,14 +45,19 @@
       <nut-cell :title="`共${goodInfo.count}件商品`"></nut-cell>
       <nut-cell>
         <template #default>
-                    <view class="top">
+          <view class="center-box">
-                        <image :src="goodInfo.BindGoods?.cover"/>
+            <view
-                        <view class="title"
+              class="top"
-                        >{{ goodInfo.BindGoods?.name }}
+              v-for="(item, index) in goodInfo.OrderGoods"
-                        </view>
+              :key="index"
+            >
+              <image :src="item.Goods?.cover" />
+              <view class="title">{{ item.Goods?.name }} </view>
               <view class="right">
-                            <view>{{ goodInfo.BindGoods?.number }}</view>
+                <view>{{ item.pay_price }}元</view>
-                            <view>x{{ goodInfo.count }}</view>
+                <view>{{ item.pay_integral }}积分</view>
+                <view>x{{ item.number }}</view>
+              </view>
             </view>
           </view>
         </template>
@@ -65,9 +70,7 @@
       <nut-cell
         v-if="goodInfo.expires !== 0"
         title="订单过期时间:"
-                :desc="
+        :desc="dayjs.unix(goodInfo.expires).format('YYYY-MM-DD HH:mm:ss')"
-                    dayjs.unix(goodInfo.expires).format('YYYY-MM-DD HH:mm:ss')
-                "
       ></nut-cell>
       <nut-cell
         title="支付状态:"
@@ -81,19 +84,20 @@
             : '已失效'
         "
       ></nut-cell>
-            <nut-cell
+      <!-- <nut-cell
         :title="`商品总价(${type === '1' ? '元' : '积分'}):`"
         :desc="goodInfo.number"
-            ></nut-cell>
+      >
-            <nut-cell>
+      </nut-cell> -->
+      <nut-cell v-if="goodInfo.status !== 0">
         <template #default>
           <view style="text-align: right; width: 100%">
             <view
-                        >{{
+              >实付款({{ goodInfo.pay_type === 1 ? "微信" : "积分" }})
-                                goodInfo.status === 0 ? '应付款' : '实付款'
-                            }}({{ type === '1' ? '元' : '积分' }}):
               <nut-price
-                                :price="goodInfo.number"
+                :price="
+                  goodInfo.pay_type === 1 ? goodInfo.price : goodInfo.exchange
+                "
                 size="normal"
                 :need-symbol="false"
               />
@@ -144,136 +148,149 @@
     </nut-popup>
     <pay
       :isShowPay="isShowPay"
-            :payType="type === '1' ? 'wx' : 'jf'"
+      :interval="false"
+      :jfInfo="jfInfo"
+      :OrderType="2"
       @errPay="errPay"
       @closePay="closePay"
-            :jfInfo="jfInfo"
     />
   </view>
 </template>
 
 <script setup lang="ts">
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {Find, Service} from '@nutui/icons-vue-taro'
+import { Find, Service } from "@nutui/icons-vue-taro";
-import {ref} from 'vue'
+import { ref } from "vue";
-import dayjs from 'dayjs'
+import dayjs from "dayjs";
-import duration from 'dayjs/plugin/duration'
+import duration from "dayjs/plugin/duration";
-import Pay from '@/components/Pay.vue'
+import Pay from "@/components/Pay.vue";
 
-dayjs.extend(duration)
+dayjs.extend(duration);
 
-const goodInfo = ref<any>({})
+const goodInfo = ref<any>({});
 
 const statusList = ref([
   {
     id: 0,
-        text: '待付款'
+    text: "待付款",
   },
   {
     id: 1,
-        text: '待使用'
+    text: "待使用",
   },
   {
     id: 2,
-        text: '已使用'
+    text: "已使用",
   },
   {
     id: 3,
-        text: '已失效'
+    text: "已失效",
-    }
+  },
-])
+]);
 
-const isShowCode = ref(false)
+const isShowCode = ref(false);
-const isShowPay = ref(false)
+const isShowPay = ref(false);
-const jfInfo = ref<any>({})
+const jfInfo = ref<any>({});
 
-const type = ref('')
+const type = ref("");
 
-const url = ref('')
+const url = ref("");
 
 Taro.useLoad((options) => {
-    type.value = options.type
+  type.value = options.type;
-    goodInfo.value = Taro.getStorageSync('item')
+  goodInfo.value = Taro.getStorageSync("item");
   if (goodInfo.value.status === 1) {
-        startTime()
+    startTime();
   }
-})
+});
 
 const toPhone = () => {
   Taro.makePhoneCall({
-        phoneNumber: goodInfo.value.BindStore.mobile
+    phoneNumber: goodInfo.value.Store.mobile,
-    })
+  });
-}
+};
 
 const toAdder = () => {
   Taro.openLocation({
-        latitude: Number(goodInfo.value.BindStore.lat),
+    latitude: Number(goodInfo.value.Store.lat),
-        longitude: Number(goodInfo.value.BindStore.lon),
+    longitude: Number(goodInfo.value.Store.lon),
-        scale: 18
+    scale: 18,
-    })
+  });
-}
+};
 
 const openPay = () => {
-    isShowPay.value = true
+  isShowPay.value = true;
-    jfInfo.value = Taro.getStorageSync('item')
+  jfInfo.value = Taro.getStorageSync("item");
-}
+};
+
+const successPay = (val: boolean) => {
+  isShowPay.value = val;
+  Taro.showToast({
+    title: "支付成功",
+    icon: "none",
+  });
+  Taro.navigateBack({
+    delta: 1,
+  });
+};
 
 const errPay = () => {
-    isShowPay.value = false
+  isShowPay.value = false;
   Taro.showToast({
-        title: '支付失败',
+    title: "支付失败",
-        icon: 'none'
+    icon: "none",
-    })
+  });
-    jfInfo.value = {}
+  jfInfo.value = {};
-}
+};
 const closePay = () => {
-    isShowPay.value = false
+  isShowPay.value = false;
   Taro.showToast({
-        title: '支付取消',
+    title: "支付取消",
-        icon: 'none'
+    icon: "none",
-    })
+  });
-    jfInfo.value = {}
+  jfInfo.value = {};
-}
+};
 
 const openCode = () => {
-    url.value = `https://api.pwmqr.com/qrcode/create?url=${goodInfo.value.oid}`
+  url.value = `https://api.pwmqr.com/qrcode/create?url=${goodInfo.value.oid}`;
-    isShowCode.value = true
+  isShowCode.value = true;
-}
+};
 
 const closed = () => {
-    isShowCode.value = false
+  isShowCode.value = false;
-    url.value = ''
+  url.value = "";
-}
+};
 
-let timeId: any
+let timeId: any;
 
-const timeStr = ref('????')
+const timeStr = ref("????");
 
 const startTime = () => {
-    const nowTime = dayjs()
+  const nowTime = dayjs();
-    const endTime = dayjs(goodInfo.value.expires * 1000)
+  const endTime = dayjs(goodInfo.value.expires * 1000);
 
   // 计算剩余时间的持续时间对象
-    const duration = dayjs.duration(endTime.diff(nowTime))
+  const duration = dayjs.duration(endTime.diff(nowTime));
 
   // 格式化剩余时间
-    timeStr.value = duration.format('D天H小时m分钟s秒')
+  timeStr.value = duration.format("D天H小时m分钟s秒");
 
   if (goodInfo.value.expires - dayjs().unix() > 0) {
-        clearInterval(timeId)
+    clearInterval(timeId);
     timeId = setTimeout(() => {
-            startTime()
+      startTime();
-        }, 1000)
+    }, 1000);
-    }
   }
+};
 
 Taro.useUnload(() => {
-    clearTimeout(timeId)
+  clearTimeout(timeId);
-})
+});
 </script>
 
 <style lang="scss">
 page {
+  --nut-cell-desc-color: #999;
   height: 100vh;
   box-sizing: border-box;
   padding-bottom: 100px;
@@ -391,15 +408,22 @@ page {
   align-items: flex-start;
 }
 
+.center-box {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+
   .top {
     width: 100%;
     display: flex;
     justify-content: space-between;
     align-items: center;
+    margin-bottom: 10rpx;
 
     image {
       width: 150px;
       height: 150px;
+      border-radius: 10rpx;
     }
 
     .title {
@@ -418,6 +442,7 @@ page {
       text-align: right;
     }
   }
+}
 
 .code-box {
   padding: 20px;

src/pages/users/setting/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '个人设置'
+  navigationBarTitleText: "个人设置",
-})
+});

src/pages/users/setting/index.vue

@@ -1,18 +1,22 @@
 <script lang="ts" setup>
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
 
 const toPage = (url: string) => {
-  if (url === '1') return Taro.showToast({title: '暂未开放', icon: 'none'})
+  if (url === "1") return Taro.showToast({ title: "暂未开放", icon: "none" });
   Taro.navigateTo({
-    url: url
+    url: url,
-  })
+  });
-}
+};
 </script>
 
 <template>
   <view class="app">
     <nut-cell-group>
-      <nut-cell title="个人信息" is-link @click="toPage('/pages/users/user_setting/index')"></nut-cell>
+      <nut-cell
+        title="个人信息"
+        is-link
+        @click="toPage('/pages/users/user_setting/index')"
+      ></nut-cell>
       <nut-cell title="关于我们" is-link @click="toPage('1')"></nut-cell>
       <nut-cell title="资质证明" is-link @click="toPage('1')"></nut-cell>
       <nut-cell title="协议规则" is-link @click="toPage('1')"></nut-cell>

src/pages/users/settled_mer/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '商户入驻',
+  navigationBarTitleText: "商户入驻",
-})
+});

src/pages/users/settled_mer/index.vue

@@ -1,13 +1,11 @@
 <script lang="ts" setup>
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
-import {ref} from 'vue'
+import { ref } from "vue";
-import {applyMer, getMerTypeList, getVerifyCode} from '@/api/user'
+import { applyMer, getMerTypeList, getVerifyCode } from "@/api/user";
-import Upload from '@/components/Upload.vue'
+import Upload from "@/components/Upload.vue";
 
 const visible = ref(false);
 
-const merType = ref(false);
-
 const merGooType = ref(false);
 
 // 验证码按钮文字
@@ -17,13 +15,30 @@ const smsStr = ref("获取验证码");
 const smsDisabled = ref(false);
 
 // 表单数据
-const formValue = ref<any>({
+const formValue = ref<{
+  name: string;
+  userName: string;
+  phone: string;
+  mobile: string;
+  code: string;
+  classId: string;
+  merGooTypeStr: string;
+  license: any[];
+  front: any[];
+  back: any[];
+  head_photo: any[];
+  img: any[];
+  bank: string;
+  bank_card: string;
+  bank_name: string;
+  bank_user: string;
+  address: string;
+}>({
   name: "",
   userName: "",
   phone: "",
+  mobile: "",
   code: "",
-    bType: "",
-    merTypeStr: "",
   classId: "",
   merGooTypeStr: "",
   license: [],
@@ -40,8 +55,6 @@ const formValue = ref<any>({
 
 const merGooList = ref([]);
 
-const merList = ref([]);
-
 // 表单校验
 const ruleForm = ref<any>(null);
 
@@ -53,19 +66,10 @@ Taro.useLoad(() => {
 const getMerType = async () => {
   try {
     const res = await getMerTypeList();
-        console.log(res);
+    merGooList.value = res.data.class.map((item: any) => ({
-        merList.value = res.data.type.map((item: any) => {
-            return {
       text: item.name,
       value: item.ID,
-            };
+    }));
-        });
-        merGooList.value = res.data.class.map((item: any) => {
-            return {
-                text: item.name,
-                value: item.ID,
-            };
-        });
   } catch (e) {
     Taro.showToast({
       title: e.msg,
@@ -139,13 +143,6 @@ const getSmsCode = () => {
   });
 };
 
-// 选择商户类型
-const confirmMerType = (e: any) => {
-    formValue.value.merTypeStr = e.selectedOptions[0].text;
-    formValue.value.bType = e.selectedOptions[0].value;
-    merType.value = false;
-};
-
 // 选择经营类目
 const confirmGooType = (e: any) => {
   formValue.value.merGooTypeStr = e.selectedOptions[0].text;
@@ -357,33 +354,6 @@ const submit = () => {
           placeholder="请输入银行卡号"
         />
       </nut-form-item>
-            <nut-form-item
-                required
-                label="商户类型"
-                prop="merTypeStr"
-                :rules="[
-                    {
-                        required: true,
-                        message: '请选择商户类型',
-                    },
-                ]"
-            >
-                <input
-                    type="text"
-                    :disabled="true"
-                    v-model="formValue.merTypeStr"
-                    placeholder="请选择商户类型"
-                    @click="merType = true"
-                />
-                <nut-popup position="bottom" v-model:visible="merType">
-                    <nut-picker
-                        :columns="merList"
-                        title="商户类型"
-                        @confirm="confirmMerType"
-                        @cancel="merType = false"
-                    ></nut-picker>
-                </nut-popup>
-            </nut-form-item>
       <nut-form-item
         required
         label="经营类目"
@@ -402,9 +372,14 @@ const submit = () => {
           placeholder="请选择经营类目"
           @click="merGooType = true"
         />
-                <nut-popup position="bottom" v-model:visible="merGooType">
+        <nut-popup
+          position="bottom"
+          v-model:visible="merGooType"
+          :safe-area-inset-bottom="true"
+          :catch-move="true"
+        >
           <nut-picker
-                        :columns="merGooList"
+            v-model:columns="merGooList"
             title="商户类型"
             @confirm="confirmGooType"
             @cancel="merGooType = false"
@@ -494,8 +469,8 @@ const submit = () => {
 
       <view class="btn">
         <nut-button block type="primary" round @click="submit()"
-                    >提交</nut-button
+          >提交
-                >
+        </nut-button>
       </view>
     </nut-form>
     <!--  入驻协议弹窗  -->

src/pages/users/user_setting/index.config.ts

@@ -1,3 +1,3 @@
 export default definePageConfig({
-    navigationBarTitleText: '个人资料',
+  navigationBarTitleText: "个人资料",
-})
+});

src/pages/users/user_setting/index.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import Taro from "@tarojs/taro";
 import { ref } from "vue";
-import { getPersonalInfo, editPersonalInfo, getPhone } from "@/api/user";
+import { getPersonalInfo, editPersonalInfo } from "@/api/user";
 import { View } from "@tarojs/components";
 import { BASE_URL } from "@/utils/request";
 
@@ -10,7 +10,7 @@ import { BASE_URL } from "@/utils/request";
 const userInfo = ref<any>({});
 
 Taro.useLoad(() => {
-    const data = Taro.getStorageSync("userInfo");
+  const { data: data } = Taro.getStorageSync("userInfo");
   userInfo.value = data;
 });
 
@@ -50,8 +50,7 @@ const chooseavatar = (e: any) => {
 
 const subUser = async () => {
   try {
-        const reg =
+    const reg = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
-            /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
     if (!reg.test(userInfo.value.phone))
       return Taro.showToast({
         title: "请输入正确的手机号码",
@@ -73,17 +72,17 @@ const subUser = async () => {
   }
 };
 
-const getUserInfo = async () => {
+// const getUserInfo = async () => {
-    try {
+//   try {
-        const res = await getPersonalInfo();
+//     const res = await getPersonalInfo();
-        userInfo.value = res.data.data;
+//     userInfo.value = res.data.data;
-    } catch (error) {
+//   } catch (error) {
-        Taro.showToast({
+//     Taro.showToast({
-            title: error.msg,
+//       title: error.msg,
-            icon: "none",
+//       icon: "none",
-        });
+//     });
-    }
+//   }
-};
+// };
 </script>
 
 <template>
@@ -93,15 +92,9 @@ const getUserInfo = async () => {
       <!-- {{ userInfo }} -->
       <view class="avatar-card">
         <view class="left">
-                    <nut-button
+          <nut-button open-type="chooseAvatar" @chooseavatar="chooseavatar">
-                        open-type="chooseAvatar"
-                        @chooseavatar="chooseavatar"
-                    >
             <nut-avatar size="large">
-                            <img
+              <img style="border-radius: 50%" :src="userInfo.avatarUrl" />
-                                style="border-radius: 50%"
-                                :src="userInfo.avatarUrl"
-                            />
             </nut-avatar>
           </nut-button>
 
@@ -140,16 +133,13 @@ const getUserInfo = async () => {
           />
         </template>
       </nut-cell>
-            <nut-cell title="注销账号" desc="账号注销后不能恢复" is-link>
+      <nut-cell title="注销账号" desc="账号注销后不能恢复" is-link> </nut-cell>
-            </nut-cell>
     </nut-cell-group>
     <view class="btn">
       <nut-button block @click="subUser">保存信息</nut-button>
     </view>
     <view class="btn">
-            <nut-button block type="primary" @click="logOut"
+      <nut-button block type="primary" @click="logOut">退出登录</nut-button>
-                >退出登录</nut-button
-            >
     </view>
   </view>
 </template>

src/static/font_4211210_2x20brbrv94.css

@@ -1,8 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4211210 */
-  src: url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff2?t=1692081500100') format('woff2'),
+  src: url("https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff2?t=1692081500100")
-       url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff?t=1692081500100') format('woff'),
+      format("woff2"),
-       url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.ttf?t=1692081500100') format('truetype');
+    url("https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff?t=1692081500100")
+      format("woff"),
+    url("https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.ttf?t=1692081500100")
+      format("truetype");
 }
 
 .iconfont {
@@ -136,4 +139,3 @@
 .icon-fontbgcolor-copy:before {
   content: "\eae7";
 }
-

src/static/iconfont/iconfont.css

@@ -1,8 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 993865 */
-  src: url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff2?t=1681715156711') format('woff2'),
+  src: url("https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff2?t=1681715156711")
-       url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff?t=1681715156711') format('woff'),
+      format("woff2"),
-       url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.ttf?t=1681715156711') format('truetype');
+    url("https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff?t=1681715156711")
+      format("woff"),
+    url("https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.ttf?t=1681715156711")
+      format("truetype");
 }
 
 .iconfont {

src/utils/index.ts

@@ -7,14 +7,21 @@ export function calculateDistance(
   la2: number,
   lo2: number
 ): any {
-    var radLat1 = la1 * Math.PI / 180.0;
+  var radLat1 = (la1 * Math.PI) / 180.0;
-    var radLat2 = la2 * Math.PI / 180.0;
+  var radLat2 = (la2 * Math.PI) / 180.0;
   var a = radLat1 - radLat2;
-    var b = lo1 * Math.PI / 180.0 - lo2 * Math.PI / 180.0;
+  var b = (lo1 * Math.PI) / 180.0 - (lo2 * Math.PI) / 180.0;
-    var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+  var s =
+    2 *
+    Math.asin(
+      Math.sqrt(
+        Math.pow(Math.sin(a / 2), 2) +
+          Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)
+      )
+    );
   s = s * 6378.137;
   s = Math.round(s * 10000) / 10000;
-    return s.toFixed(2) + 'km'
+  return s.toFixed(2) + "km";
 }
 
 // 将角度转换为弧度

src/utils/request.ts

@@ -1,6 +1,6 @@
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
 
-export const BASE_URL = process.env.TARO_APP_API
+export const BASE_URL = process.env.TARO_APP_API;
 
 interface Res<T> {
   code: number;
@@ -8,47 +8,38 @@ interface Res<T> {
   msg: string;
 }
 
-type Method = 'GET' | 'POST' | 'PUT' | 'DELETE';
+type Method = "GET" | "POST" | "PUT" | "DELETE";
 
 const request = (
   url: string,
   data: object = {},
-    method: Method = 'GET'
+  method: Method = "GET"
 ): Promise<Res<any>> => {
   return new Promise((resolve, reject) => {
-        // Taro.showLoading({
-        //     title: '加载中...',
-        //     mask: true
-        // })
     Taro.request({
       url: BASE_URL + url,
       data: data,
       method: method,
       header: {
-                'content-type': 'application/json',
+        "content-type": "application/json",
-                token: Taro.getStorageSync('token') || ''
+        token: Taro.getStorageSync("token") || "",
       },
       success: ({ data }) => {
-                // Taro.hideLoading()
         if (data.code !== 200) {
           Taro.showToast({
             title: data.msg,
-                        icon: 'none'
+            icon: "none",
-                    })
+          });
-                    reject(data)
+          reject(data);
-                    return
+        } else {
+          resolve(data);
         }
-                resolve(data)
       },
-            fail: () => {
+      fail: (err) => {
-                Taro.showToast({
+        reject(err);
-                    title: '服务器异常',
+      },
-                    icon: 'none'
+    });
-                })
+  });
-                reject({code: 1, msg: '服务器异常'})
+};
-            }
-        })
-    })
-}
 
-export default request
+export default request;

tsconfig.json

@@ -19,11 +19,10 @@
     "allowJs": true,
     "resolveJsonModule": true,
     "typeRoots": ["node_modules/@types"],
-        "types": ["@tarojs/components/vue3"],
     "paths": {
       "@/*": ["src/*"]
     }
   },
-    "include": ["./src", "./types", "components.d.ts"],
+  "include": ["./src", "./types", "./config"],
   "compileOnSave": false
 }

types/global.d.ts

@@ -1,22 +1,31 @@
 /// <reference types="@tarojs/taro" />
 
-declare module '*.png';
+declare module "*.png";
-declare module '*.gif';
+declare module "*.gif";
-declare module '*.jpg';
+declare module "*.jpg";
-declare module '*.jpeg';
+declare module "*.jpeg";
-declare module '*.svg';
+declare module "*.svg";
-declare module '*.css';
+declare module "*.css";
-declare module '*.less';
+declare module "*.less";
-declare module '*.scss';
+declare module "*.scss";
-declare module '*.sass';
+declare module "*.sass";
-declare module '*.styl';
+declare module "*.styl";
 
 declare namespace NodeJS {
   interface ProcessEnv {
-    TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt' | 'quickapp' | 'qq' | 'jd'
+    TARO_ENV:
+      | "weapp"
+      | "swan"
+      | "alipay"
+      | "h5"
+      | "rn"
+      | "tt"
+      | "quickapp"
+      | "qq"
+      | "jd";
   }
 }
 
-declare module '@tarojs/components' {
+declare module "@tarojs/components" {
-  export * from '@tarojs/components/types/index.vue3'
+  export * from "@tarojs/components/types/index.vue3";
 }

types/vue.d.ts

@@ -1,6 +1,6 @@
-export {}
+export {};
 
-declare module 'vue' {
+declare module "vue" {
   export interface GlobalComponents extends JSX.IntrinsicElements {
     /** Note: Vue 在 runtime 中将 JSX.IntrinsicElements 通过 index signature 重复声明标签
      * 这会导致插件无法正常跳转类型，可以手动覆盖声明标签活得更好的体验，参考如下：