优化

会员等级编辑修复
部分问题修复
2026-01-26 16:04:39 +08:00 · 2026-01-19 10:15:25 +08:00 · 2026-01-17 17:22:59 +08:00 · 2026-01-17 11:05:55 +08:00 · 2026-01-17 10:37:54 +08:00 · 2026-01-17 10:36:45 +08:00
12 changed files with 498 additions and 421 deletions
--- a/App.vue
+++ b/App.vue
@@ -9,6 +9,7 @@ import appConfig from '@/config/appConfig.js';
 import { provide, onMounted } from 'vue';
 import WebsocketUtil from '@/commons/utils/websocket.js';

+console.log('appConfig.wss',appConfig.wss);
 const websocketUtil = new WebsocketUtil(appConfig.wss, 5000); // 创建 WebSocket 工具类实例
 provide('websocketUtil', websocketUtil); // 提供给所有子组件
 onMounted(() => {});
--- a/config/appConfig.js
+++ b/config/appConfig.js
@@ -1,5 +1,5 @@
 //当前环境 test,prod
-export const ENV = 'test'
+export const ENV = 'prod'
 export const ENV_BASE_URL = {
 	java: {
 		prod: 'https://cashier.sxczgkj.com/',
@@ -15,6 +15,7 @@ export const ENV_BASE_URL = {
 	}
 }

+
 /**
 * @param {String} env  环境，测试或者正式 
 * @param {String} apiType 语言，java或者php 
@@ -24,8 +25,8 @@ export function returnBaseUrl(param) {
 		env,
 		apiType
 	} = param
-	if(!env){
-		env=ENV
+	if (!env) {
+		env = ENV
 	}
 	console.log('env', env);
 	console.log('apiType', apiType);
@@ -69,6 +70,23 @@ export function returnBaseUrl(param) {

 }

+function returnWss(env) {
+	// #ifdef H5
+	if (env === 'test') {
+		return 'http://192.168.1.42:2348'
+	} else {
+		return 'https://czgeatws.sxczgkj.com/wss'
+	}
+	// #endif
+	// #ifndef H5
+	if (env === 'test') {
+		return 'ws://192.168.1.42:2348'
+	} else {
+		return 'wss://czgeatws.sxczgkj.com/wss'
+	}
+	// #endif
+
+}


 const appConfig = {
@@ -84,7 +102,7 @@ const appConfig = {
 	env: {},

 	// wss: "wss://sockets.sxczgkj.com/wss", //测试环境
-	wss: "wss://czgeatws.sxczgkj.com/wss", //正式环境
+	wss: returnWss(), //正式环境
 	// 环境变量常量
 	ENV_ENUM: {
 		DEVELOPMENT: 'development', // 本地调试地址 
--- a/env/config.js
+++ b/env/config.js
@@ -30,7 +30,7 @@ const processEnv = process.env.NODE_ENV
 // 改变env环境
 function changeEnv(envMode){
 	appConfig.env = allEnvMap[envMode || processEnv]
-	appConfig.wss = allEnvMap[envMode || processEnv].JEEPAY_BASE_URL_WSS
+	// appConfig.wss = allEnvMap[envMode || processEnv].JEEPAY_BASE_URL_WSS
 }

 export default { changeEnv: changeEnv }
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,10 +14,11 @@
        "jsbn": "^1.1.0",
        "jsencrypt": "^3.3.2",
        "lodash": "^4.17.21",
+        "marked": "4.x",
        "pinia-plugin-unistorage": "^0.1.2",
        "to-arraybuffer": "^1.0.1",
        "uview-plus": "^3.3.32",
-        "ysk-utils": "^1.0.78"
+        "ysk-utils": "^1.0.85"
      },
      "devDependencies": {
        "copy-webpack-plugin": "^12.0.2",
@@ -30,7 +31,6 @@
      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@jridgewell/set-array": "^1.2.1",
        "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -45,7 +45,6 @@
      "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=6.0.0"
      }
@@ -55,7 +54,6 @@
      "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz",
      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=6.0.0"
      }
@@ -65,7 +63,6 @@
      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@jridgewell/gen-mapping": "^0.3.5",
        "@jridgewell/trace-mapping": "^0.3.25"
@@ -75,15 +72,13 @@
      "version": "1.5.0",
      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@jridgewell/trace-mapping": {
      "version": "0.3.25",
      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@jridgewell/resolve-uri": "^3.1.0",
        "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -141,7 +136,6 @@
      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-9.6.1.tgz",
      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@types/estree": "*",
        "@types/json-schema": "*"
@@ -152,7 +146,6 @@
      "resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@types/eslint": "*",
        "@types/estree": "*"
@@ -162,8 +155,7 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.7.tgz",
      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@types/json-schema": {
      "version": "7.0.15",
@@ -176,7 +168,6 @@
      "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.14.1.tgz",
      "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "undici-types": "~6.21.0"
      }
@@ -186,7 +177,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.14.1.tgz",
      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/helper-numbers": "1.13.2",
        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
@@ -196,29 +186,25 @@
      "version": "1.13.2",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@webassemblyjs/helper-api-error": {
      "version": "1.13.2",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@webassemblyjs/helper-buffer": {
      "version": "1.14.1",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@webassemblyjs/helper-numbers": {
      "version": "1.13.2",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
        "@webassemblyjs/helper-api-error": "1.13.2",
@@ -229,15 +215,13 @@
      "version": "1.13.2",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@webassemblyjs/helper-wasm-section": {
      "version": "1.14.1",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/ast": "1.14.1",
        "@webassemblyjs/helper-buffer": "1.14.1",
@@ -250,7 +234,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@xtuc/ieee754": "^1.2.0"
      }
@@ -260,7 +243,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@xtuc/long": "4.2.2"
      }
@@ -269,15 +251,13 @@
      "version": "1.13.2",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@webassemblyjs/wasm-edit": {
      "version": "1.14.1",
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/ast": "1.14.1",
        "@webassemblyjs/helper-buffer": "1.14.1",
@@ -294,7 +274,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/ast": "1.14.1",
        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
@@ -308,7 +287,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/ast": "1.14.1",
        "@webassemblyjs/helper-buffer": "1.14.1",
@@ -321,7 +299,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/ast": "1.14.1",
        "@webassemblyjs/helper-api-error": "1.13.2",
@@ -336,7 +313,6 @@
      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@webassemblyjs/ast": "1.14.1",
        "@xtuc/long": "4.2.2"
@@ -346,22 +322,19 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/@xtuc/long": {
      "version": "4.2.2",
      "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/acorn": {
      "version": "8.14.1",
      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.1.tgz",
      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
      "dev": true,
-      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -374,6 +347,7 @@
      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.16.0.tgz",
      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
      "dev": true,
+      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.3",
        "json-schema-traverse": "^1.0.0",
@@ -547,8 +521,7 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/caniuse-lite": {
      "version": "1.0.30001715",
@@ -568,8 +541,7 @@
          "type": "github",
          "url": "https://github.com/sponsors/ai"
        }
-      ],
-      "peer": true
+      ]
    },
    "node_modules/chokidar": {
      "version": "3.6.0",
@@ -612,7 +584,6 @@
      "resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=6.0"
      }
@@ -631,8 +602,7 @@
      "version": "2.20.3",
      "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/copy-webpack-plugin": {
      "version": "12.0.2",
@@ -672,8 +642,7 @@
      "version": "1.5.141",
      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.141.tgz",
      "integrity": "sha512-qS+qH9oqVYc1ooubTiB9l904WVyM6qNYxtOEEGReoZXw3xlqeYdFr5GclNzbkAufWgwWLEPoDi3d9MoRwwIjGw==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/emojis-list": {
      "version": "3.0.0",
@@ -689,7 +658,6 @@
      "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "graceful-fs": "^4.2.4",
        "tapable": "^2.2.0"
@@ -702,15 +670,13 @@
      "version": "1.7.0",
      "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/escalade": {
      "version": "3.2.0",
      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz",
      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=6"
      }
@@ -720,7 +686,6 @@
      "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "esrecurse": "^4.3.0",
        "estraverse": "^4.1.1"
@@ -734,7 +699,6 @@
      "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "estraverse": "^5.2.0"
      },
@@ -747,7 +711,6 @@
      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=4.0"
      }
@@ -757,7 +720,6 @@
      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=4.0"
      }
@@ -767,7 +729,6 @@
      "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=0.8.x"
      }
@@ -863,8 +824,7 @@
      "version": "0.4.1",
      "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/globby": {
      "version": "14.0.2",
@@ -908,15 +868,13 @@
      "version": "4.2.11",
      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=8"
      }
@@ -1001,7 +959,6 @@
      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@types/node": "*",
        "merge-stream": "^2.0.0",
@@ -1030,8 +987,7 @@
      "version": "2.3.1",
      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/json-schema-traverse": {
      "version": "1.0.0",
@@ -1065,7 +1021,6 @@
      "resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=6.11.5"
      }
@@ -1095,12 +1050,23 @@
      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
+    "node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/merge2": {
      "version": "1.4.1",
@@ -1129,7 +1095,6 @@
      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">= 0.6"
      }
@@ -1139,7 +1104,6 @@
      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "mime-db": "1.52.0"
      },
@@ -1157,8 +1121,7 @@
      "version": "2.0.19",
      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.19.tgz",
      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/normalize-path": {
      "version": "3.0.0",
@@ -1185,8 +1148,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -1322,6 +1284,7 @@
      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.78.0.tgz",
      "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
      "dev": true,
+      "peer": true,
      "dependencies": {
        "chokidar": ">=3.0.0 <4.0.0",
        "immutable": "^4.0.0",
@@ -1376,6 +1339,7 @@
      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
      "dev": true,
+      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
@@ -1482,7 +1446,6 @@
      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -1501,7 +1464,6 @@
      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -1512,7 +1474,6 @@
      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "has-flag": "^4.0.0"
      },
@@ -1528,7 +1489,6 @@
      "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=6"
      }
@@ -1538,7 +1498,6 @@
      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.39.0.tgz",
      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@jridgewell/source-map": "^0.3.3",
        "acorn": "^8.8.2",
@@ -1557,7 +1516,6 @@
      "resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "@jridgewell/trace-mapping": "^0.3.25",
        "jest-worker": "^27.4.5",
@@ -1613,8 +1571,7 @@
      "version": "6.21.0",
      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-6.21.0.tgz",
      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
    },
    "node_modules/unicorn-magic": {
      "version": "0.1.0",
@@ -1647,7 +1604,6 @@
          "url": "https://github.com/sponsors/ai"
        }
      ],
-      "peer": true,
      "dependencies": {
        "escalade": "^3.2.0",
        "picocolors": "^1.1.1"
@@ -1685,7 +1641,6 @@
      "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.2.tgz",
      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
      "dev": true,
-      "peer": true,
      "dependencies": {
        "glob-to-regexp": "^0.4.1",
        "graceful-fs": "^4.1.2"
@@ -1746,15 +1701,15 @@
      "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
      "dev": true,
-      "peer": true,
      "engines": {
        "node": ">=10.13.0"
      }
    },
    "node_modules/ysk-utils": {
-      "version": "1.0.78",
-      "resolved": "https://registry.npmmirror.com/ysk-utils/-/ysk-utils-1.0.78.tgz",
-      "integrity": "sha512-Bgr5B3WWiy0nbgL91QVKoVPYm4wt13Rlav757zEjMVRHbmTjwFEhi3wJlYus0JGd52mbknSxXHMazAPHXwA7uQ==",
+      "version": "1.0.85",
+      "resolved": "https://registry.npmmirror.com/ysk-utils/-/ysk-utils-1.0.85.tgz",
+      "integrity": "sha512-HkbV4Jidi3G6DAuGAN972tClUYtC2zVoxo4crrxexfn0rZa8HjXatUfEbawHOeEzyl6G1CdC+160I2bKfxEBlA==",
+      "license": "ISC",
      "dependencies": {
        "bignumber.js": "^9.3.1",
        "loadsh": "^0.0.4",
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
    "pinia-plugin-unistorage": "^0.1.2",
    "to-arraybuffer": "^1.0.1",
    "uview-plus": "^3.3.32",
-    "ysk-utils": "^1.0.82"
+    "ysk-utils": "^1.0.85"
  },
  "devDependencies": {
    "copy-webpack-plugin": "^12.0.2",
--- a/pageMarket/superVip/vip-lv-add.vue
+++ b/pageMarket/superVip/vip-lv-add.vue
@@ -274,6 +274,7 @@ onLoad((opt) => {
    );
    optiopns.index = index;
    const item = superVipStore.vipLevelList.find((item) => item.id == opt.id);
+	item.cycleRewardCouponList=item.cycleRewardCouponList||[]
    Object.assign(form, item);
  }
 });
--- a/pagesCreateOrder/index/components/car.vue
+++ b/pagesCreateOrder/index/components/car.vue
@@ -41,7 +41,7 @@
            :key="index"
          >
            <view>
-              <view class="up-line-1">{{ item.name }}</view>
+              <view class="up-line-1" :style="returnStyle(item)">{{ item.name }}</view>
              <view class="u-m-t-10 u-font-24 color-666 up-line-1">{{
                item.specInfo || ""
              }}</view>
@@ -62,7 +62,7 @@
                  mode=""
                />
              </view>
-              <view class="u-m-l-30 u-m-r-30 color-333">
+              <view class="u-m-l-30 u-m-r-30 color-333" @tap="changeNumber(item)">
                {{ item.number.toFixed(2) }}
              </view>
              <view class="u-flex" @tap="updateNumber(true, index, item)">
@@ -234,6 +234,20 @@ const props = defineProps({
 });


+function returnStyle(item){
+	let width=360
+	let priceLen=0
+	if(item.is_time_discount){
+		priceLen+=`${formatPrice(item.lowPrice * item.number)}`.length
+		priceLen+=`${returnLimitTotalPrice(item)}`.length
+	}else{
+		priceLen+=`${formatPrice(item.lowPrice * item.number)}`.length
+	}
+	width-=16*priceLen
+	return {
+		width:width+'rpx'
+	}
+}

 function returnLimitPrice(data) {
  const price = yskUtils.limitUtils.returnPrice({
@@ -328,7 +342,11 @@ function setModalShow(key = "show", show = true, type = "", title = "") {
  console.log(modal);
 }

-const edmits = defineEmits(["clear", "updateNumber"]);
+const edmits = defineEmits(["clear", "updateNumber","changeNumber"]);
+
+function changeNumber(goods){
+	edmits('changeNumber',goods)
+}

 // mask
 let switchGoods = ref(false);
--- a/pagesCreateOrder/index/components/list-goods-item.vue
+++ b/pagesCreateOrder/index/components/list-goods-item.vue
@@ -1,345 +1,309 @@
 <template>
-  <view class="u-relative u-flex item">
-    <up-image
-      :src="data.coverImg"
-      mode="aspectFill"
-      :width="img.width"
-      :height="img.height"
-    ></up-image>
-    <view class="info u-flex u-row-between u-col-top u-flex-col">
-      <view class="limit-discount" v-if="is_time_discount">限时折扣</view>
+	<view class="u-relative u-flex item">
+		<up-image :src="data.coverImg" mode="aspectFill" :width="img.width" :height="img.height"></up-image>
+		<view class="info u-flex u-row-between u-col-top u-flex-col">
+			<view class="limit-discount" v-if="is_time_discount">限时折扣</view>

-      <view>
-        <view>
-          <text class="up-line-1">{{ data.name }}</text>
-        </view>
-        <view>
-          <text class="u-font-32 font-bold u-m-t-16" v-if="is_time_discount"> ￥{{ limitPrice }} </text>
-          <text
-            class="u-font-32 font-bold u-m-t-16"
-            :class="[is_time_discount ? 'line-through' : '']"
-          >
-            ￥{{ data.lowPrice }}
-          </text>
-        </view>
+			<view>
+				<view>
+					<text class="up-line-1">{{ data.name }}</text>
+				</view>
+				<view>
+					<text class="u-font-32 font-bold u-m-t-16" v-if="is_time_discount"> ￥{{ limitPrice }} </text>
+					<text class="u-font-32 font-bold u-m-t-16" :class="[is_time_discount ? 'line-through' : '']">
+						￥{{ data.lowPrice }}
+					</text>
+				</view>

-        <template v-if="data.type == 'weight'">
-          <view class="btnweigh">称重</view>
-        </template>
-      </view>
-      <view class="u-flex" v-if="!isSellout">
-        <template v-if="data.type == 'sku' || data.groupType == 1">
-          <button
-            class="btn"
-            hover-class="btn-hover-class"
-            @tap="emitEvent('chooseGuige')"
-          >
-            选规格
-          </button>
-        </template>
-        <template v-else>
-          <view class="u-flex icon-btn">
-            <view
-              class="u-flex"
-              @tap.stop="emitEvent(data.type == 'weight' ? 'tapweigh' : 'add')"
-            >
-              <image
-                src="/pagesCreateOrder/static/images/icon-add.svg"
-                class="icon"
-                mode=""
-              ></image>
-            </view>
-            <template v-if="data.chooseNumber">
-              <view class="u-font-32">
-                {{ data.chooseNumber.toFixed(2) }}
-              </view>
-              <view class="u-flex" @tap.stop="emitEvent('reduce')">
-                <image
-                  src="/pagesCreateOrder/static/images/icon-reduce.svg"
-                  class="icon"
-                  mode=""
-                >
-                </image>
-              </view>
-            </template>
-          </view>
-        </template>
-      </view>
-      <template v-if="isSellout">
-        <view class="isSellout" v-if="data.isSale == 0">
-          <image
-            class="isSellout_icon"
-            src="/pagesCreateOrder/static/images/no-toDown.svg"
-            mode=""
-          ></image>
-        </view>
-        <view
-          class="isSellout"
-          v-else-if="
+				<template v-if="data.type == 'weight'">
+					<view class="btnweigh">称重</view>
+				</template>
+			</view>
+			<view class="u-flex" v-if="!isSellout">
+				<template v-if="data.type == 'sku' || data.groupType == 1">
+					<button class="btn" hover-class="btn-hover-class" @tap="emitEvent('chooseGuige')">
+						选规格
+					</button>
+				</template>
+				<template v-else>
+					<view class="u-flex icon-btn">
+						<template v-if="data.chooseNumber">
+							<view class="u-flex" @tap.stop="emitEvent('reduce')">
+								<image src="/pagesCreateOrder/static/images/icon-reduce.svg" class="icon" mode="">
+								</image>
+							</view>
+							<view class="u-font-32" >
+								{{ data.chooseNumber.toFixed(2) }}
+							</view>
+
+						</template>
+						<view class="u-flex" @tap.stop="emitEvent(data.type == 'weight' ? 'tapweigh' : 'add')">
+							<image src="/pagesCreateOrder/static/images/icon-add.svg" class="icon" mode=""></image>
+						</view>
+
+					</view>
+				</template>
+			</view>
+			<template v-if="isSellout">
+				<view class="isSellout" v-if="data.isSale == 0">
+					<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-toDown.svg" mode=""></image>
+				</view>
+				<view class="isSellout" v-else-if="
            !isProductAvailable(data.days, data.startTime, data.endTime)
-          "
-        >
-          <image
-            class="isSellout_icon"
-            src="/pagesCreateOrder/static/images/no-saleTime.svg"
-            mode=""
-          ></image>
-        </view>
-        <view class="isSellout" v-else-if="data.isSoldStock == 1">
-          <image
-            class="isSellout_icon"
-            src="/pagesCreateOrder/static/images/no-sold.svg"
-            mode=""
-          ></image>
-        </view>
-        <view
-          class="isSellout"
-          v-else-if="data.isStock == 1 && data.stockNumber <= 0"
-        >
-          <image
-            class="isSellout_icon"
-            src="/pagesCreateOrder/static/images/no-stock.svg"
-            mode=""
-          ></image>
-        </view>
-      </template>
-    </view>
-  </view>
+          ">
+					<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-saleTime.svg" mode=""></image>
+				</view>
+				<view class="isSellout" v-else-if="data.isSoldStock == 1">
+					<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-sold.svg" mode=""></image>
+				</view>
+				<view class="isSellout" v-else-if="data.isStock == 1 && data.stockNumber <= 0">
+					<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-stock.svg" mode=""></image>
+				</view>
+			</template>
+		</view>
+	</view>
 </template>

 <script setup>
-import { computed, toRef, inject } from "vue";
-import util from "../util.js";
-import dayjs from "dayjs";
-import isBetween from "dayjs/plugin/isBetween.js";
-const yskUtils = inject("yskUtils");
-const shopInfo = inject("shopInfo");
-dayjs.extend(isBetween);
+	import {
+		computed,
+		toRef,
+		inject
+	} from "vue";
+	import util from "../util.js";
+	import dayjs from "dayjs";
+	import isBetween from "dayjs/plugin/isBetween.js";
+	const yskUtils = inject("yskUtils");
+	const shopInfo = inject("shopInfo");
+	dayjs.extend(isBetween);

-const props = defineProps({
-  img: {
-    type: Object,
-    default: {
-      width: "250rpx",
-      height: "272rpx",
-    },
-  },
-  index: {
-    type: [Number, String],
-  },
-  isSeatFee: {
-    //是否为餐位费
-    type: Boolean,
-    default: false,
-  },
-  data: {
-    type: Object,
-    default: () => {
-      return {
-        chooseNumber: 0,
-      };
-    },
-  },
-  limitTimeDiscount: {
-    type: Object,
-    default: () => {
-      return {};
-    },
-  },
-});
+	const props = defineProps({
+		img: {
+			type: Object,
+			default: {
+				width: "250rpx",
+				height: "272rpx",
+			},
+		},
+		index: {
+			type: [Number, String],
+		},
+		isSeatFee: {
+			//是否为餐位费
+			type: Boolean,
+			default: false,
+		},
+		data: {
+			type: Object,
+			default: () => {
+				return {
+					chooseNumber: 0,
+				};
+			},
+		},
+		limitTimeDiscount: {
+			type: Object,
+			default: () => {
+				return {};
+			},
+		},
+	});

-//判断是否是时间折扣商品
-const is_time_discount = computed(() => {
-  if (!props.limitTimeDiscount || !props.limitTimeDiscount.id) {
-    return false;
-  }
+	//判断是否是时间折扣商品
+	const is_time_discount = computed(() => {
+		if (!props.limitTimeDiscount || !props.limitTimeDiscount.id) {
+			return false;
+		}

-  const isCanuse = yskUtils.limitUtils.canUseLimitTimeDiscount(
-    props.data,
-    props.limitTimeDiscount,
-    shopInfo,
-    null,
-    "id"
-  );
-  return isCanuse;
-});
+		const isCanuse = yskUtils.limitUtils.canUseLimitTimeDiscount(
+			props.data,
+			props.limitTimeDiscount,
+			shopInfo,
+			null,
+			"id"
+		);
+		return isCanuse;
+	});

-const limitPrice = computed(() => {
-  if (!is_time_discount.value) {
-    return 0;
-  }
-  console.log("props.data", props.data);
-  const price = yskUtils.limitUtils.returnPrice({
-    goods: props.data,
-    shopInfo: shopInfo,
-    limitTimeDiscountRes: props.limitTimeDiscount,
-    shopUserInfo: null,
-    idKey: "id",
-  });
-  return price;
-});
+	const limitPrice = computed(() => {
+		if (!is_time_discount.value) {
+			return 0;
+		}
+		console.log("props.data", props.data);
+		const price = yskUtils.limitUtils.returnPrice({
+			goods: props.data,
+			shopInfo: shopInfo,
+			limitTimeDiscountRes: props.limitTimeDiscount,
+			shopUserInfo: null,
+			idKey: "id",
+		});
+		return price;
+	});

-/**
- * 判断是否是菜品
- */
-function isGoods() {
-  return props.data.hasOwnProperty("id");
-}
+	/**
+	 * 判断是否是菜品
+	 */
+	function isGoods() {
+		return props.data.hasOwnProperty("id");
+	}

-/**
- * 判断商品是否售尽
- */
-const isSellout = computed(() => {
-  const item = props.data;
-  if (!isGoods()) {
-    return false;
-  }
-  return (
-    (item.isStock == 1 && item.stockNumber <= 0) ||
-    item.isSoldStock == 1 ||
-    item.isSale == 0 ||
-    !isProductAvailable(item.days, item.startTime, item.endTime)
-  );
-});
-// 判断商品是否在可售时间内
-function isProductAvailable(sellDaysStr, startTimeStr, endTimeStr) {
-  // 将后端返回的字符串转换为数组
-  const sellDays = sellDaysStr.split(",");
-  const now = dayjs();
-  const days = [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday",
-  ];
-  const currentDay = days[now.day()];
-  const currentTime = now.format("HH:mm:ss"); // 检查当前周几是否在可售周几列表中
+	/**
+	 * 判断商品是否售尽
+	 */
+	const isSellout = computed(() => {
+		const item = props.data;
+		if (!isGoods()) {
+			return false;
+		}
+		return (
+			(item.isStock == 1 && item.stockNumber <= 0) ||
+			item.isSoldStock == 1 ||
+			item.isSale == 0 ||
+			!isProductAvailable(item.days, item.startTime, item.endTime)
+		);
+	});
+	// 判断商品是否在可售时间内
+	function isProductAvailable(sellDaysStr, startTimeStr, endTimeStr) {
+		// 将后端返回的字符串转换为数组
+		const sellDays = sellDaysStr.split(",");
+		const now = dayjs();
+		const days = [
+			"Sunday",
+			"Monday",
+			"Tuesday",
+			"Wednesday",
+			"Thursday",
+			"Friday",
+			"Saturday",
+		];
+		const currentDay = days[now.day()];
+		const currentTime = now.format("HH:mm:ss"); // 检查当前周几是否在可售周几列表中

-  // console.log('当前日期:', currentDay);
-  // console.log('可售日期列表:', sellDays);
-  if (!sellDays.includes(currentDay)) {
-    // console.log('当前日期不在可售日期列表中');
-    return false;
-  }
-  const startTime = dayjs(`${now.format("YYYY-MM-DD")} ${startTimeStr}`);
-  let endTime = dayjs(`${now.format("YYYY-MM-DD")} ${endTimeStr}`);
-  // 处理跨天情况
-  if (endTime.isBefore(startTime)) {
-    endTime = endTime.add(1, "day");
-  } // console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss')); // console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
+		// console.log('当前日期:', currentDay);
+		// console.log('可售日期列表:', sellDays);
+		if (!sellDays.includes(currentDay)) {
+			// console.log('当前日期不在可售日期列表中');
+			return false;
+		}
+		const startTime = dayjs(`${now.format("YYYY-MM-DD")} ${startTimeStr}`);
+		let endTime = dayjs(`${now.format("YYYY-MM-DD")} ${endTimeStr}`);
+		// 处理跨天情况
+		if (endTime.isBefore(startTime)) {
+			endTime = endTime.add(1, "day");
+		} // console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss')); // console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));

-  // console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
-  const isInRange = now.isBetween(startTime, endTime, null, "[)"); // console.log('当前时间是否在可售时间范围内:', isInRange);
-  return isInRange;
-}
+		// console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
+		const isInRange = now.isBetween(startTime, endTime, null, "[)"); // console.log('当前时间是否在可售时间范围内:', isInRange);
+		return isInRange;
+	}

-const emits = defineEmits(["add", "reduce", "chooseGuige", "tapweigh"]);
+	const emits = defineEmits(["add", "reduce", "chooseGuige", "tapweigh"]);

-function emitEvent(emitName) {
-  if (isGoods()) {
-    emits(emitName, props.index);
-  }
-}
+	function emitEvent(emitName) {
+		if (isGoods()) {
+			emits(emitName, props.index);
+		}
+	}
 </script>

 <style lang="scss" scoped>
-.icon {
-  width: 48rpx;
-  height: 48rpx;
-}
+	.icon {
+		width: 48rpx;
+		height: 48rpx;
+	}

-.icon-btn {
-  gap: 14rpx;
-}
+	.icon-btn {
+		gap: 14rpx;
+	}

-.btn {
-  background: #eb4f4f;
-  border-radius: 100rpx;
-  font-size: 28rpx;
-  height: 56rpx;
-  line-height: 56rpx;
-  color: #fff;
-}
+	.btn {
+		background: #eb4f4f;
+		border-radius: 100rpx;
+		font-size: 28rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		color: #fff;
+	}

-.btnweigh {
-  margin: 5rpx 0;
-  width: 100rpx;
-  background: linear-gradient(124deg, #73c969 6%, #27921b 93%);
-  border-radius: 10rpx;
-  font-size: 24rpx;
-  padding: 6rpx 0;
-  text-align: center;
-}
+	.btnweigh {
+		margin: 5rpx 0;
+		width: 100rpx;
+		background: linear-gradient(124deg, #73c969 6%, #27921b 93%);
+		border-radius: 10rpx;
+		font-size: 24rpx;
+		padding: 6rpx 0;
+		text-align: center;
+	}

-.btn-hover-class {
-  opacity: 0.6;
-}
+	.btn-hover-class {
+		opacity: 0.6;
+	}

-image {
-  will-change: transform;
-}
+	image {
+		will-change: transform;
+	}

-.item {
-  // width: 250rpx;
-  // height: 272rpx;
-  background: #f9b798;
-  border-radius: 8rpx 8rpx 8rpx 8rpx;
-  overflow: hidden;
+	.item {
+		// width: 250rpx;
+		// height: 272rpx;
+		background: #f9b798;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
+		overflow: hidden;

-  .img {
-    width: 250rpx;
-    height: 272rpx;
-  }
+		.img {
+			width: 250rpx;
+			height: 272rpx;
+		}

-  .info {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    color: #fff;
-    padding: 52rpx 24rpx 24rpx 24rpx;
-    top: 0;
-    background: rgba(37, 22, 15, 0.5);
-    border-radius: 8rpx 8rpx 8rpx 8rpx;
-    overflow: hidden;
-  }
-}
+		.info {
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			color: #fff;
+			padding: 52rpx 24rpx 24rpx 24rpx;
+			top: 0;
+			background: rgba(37, 22, 15, 0.5);
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			overflow: hidden;
+		}
+	}

-.isSellout {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.6);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  .isSellout_icon {
-    height: 60%;
-    width: 60%;
-  }
-}
-.limit-discount {
-  background-color: #cc5617;
-  padding: 10rpx 20rpx;
-  white-space: nowrap;
-  text-align: center;
-  position: absolute;
-  top: 0;
-  left: 0;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #ffffff;
-  border-radius: 0 0rpx 20rpx 0rpx;
-  color: #fff;
-}
-.line-through{
-  font-size: 24rpx;
-  color: rgba(255, 255, 255, 0.8);
-  text-decoration: line-through;
-}
+	.isSellout {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		background-color: rgba(0, 0, 0, 0.6);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.isSellout_icon {
+			height: 60%;
+			width: 60%;
+		}
+	}
+
+	.limit-discount {
+		background-color: #cc5617;
+		padding: 10rpx 20rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #ffffff;
+		border-radius: 0 0rpx 20rpx 0rpx;
+		color: #fff;
+	}
+
+	.line-through {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.8);
+		text-decoration: line-through;
+	}
 </style>
--- a/pagesCreateOrder/index/components/popup-change-number.vue
+++ b/pagesCreateOrder/index/components/popup-change-number.vue
@@ -0,0 +1,93 @@
+<template>
+	<view>
+		<up-popup :show="show" mode="center" @close="show=flase" :close-on-click-overlay="true">
+			<view class="box">
+				<view class="u-flex u-row-between">
+					<text class="u-font-32 font-bold">修改数量</text>
+					<up-icon name="close" @click="show=false"></up-icon>
+				</view>
+				<view class="form-box">
+					<up-form label-position="left" label-width="auto">
+						<up-form-item label="数量" required>
+							<up-number-box inputWidth="200rpx" :step="1" 
+							:integer="integer"
+							v-model="number"></up-number-box>
+						</up-form-item>
+					</up-form>
+				</view>
+				<view class="u-m-t-12 u-flex gap-20">
+					<view class="u-flex-1">
+						<my-button type="default" @click="show=false">取消</my-button>
+					</view>
+					<view class="u-flex-1">
+						<my-button type="primary" @click="confirm">确认</my-button>
+					</view>
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script setup>
+	import {
+		watch,ref, computed
+	} from 'vue';
+
+	const show = defineModel(false)
+	const props = defineProps({
+		min: {
+			type: Number,
+			default: 0
+		},
+		max: {
+			type: Number,
+			default: 9999
+		},
+		goods: {
+			type: Object,
+			default: ()=>{number:0}
+		}
+	})
+	
+	
+	const integer=computed(()=>{
+		if(!props.goods){
+			return true
+		}
+		if(props.goods.product_type=="weight"){
+			return false
+		}
+		return true
+	})
+	
+	const number = ref(0)
+	
+	const emits=defineEmits('confirm')
+	function confirm(){
+		emits('confirm',{
+			goods:props.goods,
+			num:number.value
+		})
+		show.value=false
+	}
+
+	watch(() => show.value, (newval) => {
+		if (newval) {
+			number.value = props.goods.number||0
+		} else {
+			number.value = 0
+		}
+	})
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		width: 690rpx;
+		border-radius: 16rpx;
+		padding: 32rpx 28rpx;
+	}
+
+	.form-box {
+		padding: 20rpx;
+	}
+</style>
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -79,9 +79,9 @@
 						<view class="u-flex u-m-t-20 u-flex-wrap u-row-between">
 							<view class="u-m-b-30" v-for="(goodsItem, goodsIndex) in searchResult" :key="goodsIndex">
 								<list-goods-item :img="{ width: '330rpx', height: '330rpx' }"
-									:limitTimeDiscount="data.limitTimeDiscount" @chooseGuige="
-                    chooseGuige(goodsItem.goodsIndex, goodsItem.index)
-                  " @add="searchGoodsUpdate(goodsItem, goodsIndex, true)"
+									:limitTimeDiscount="data.limitTimeDiscount" 
+									@chooseGuige="chooseGuige(goodsItem.goodsIndex, goodsItem.index)" 
+									@add="searchGoodsUpdate(goodsItem, goodsIndex, true)"
 									@reduce="searchGoodsUpdate(goodsItem, goodsIndex, false)"
 									@tapweigh="tapweigh(goodsItem.goodsIndex, goodsItem.index)"
 									:index="goodsItem.goodsIndex" :data="goodsItem"></list-goods-item>
@@ -96,6 +96,7 @@
 		<view class="bottom w-full">
 			<my-car :isCreateOrderToDetail="isCreateOrderToDetail" @updateNumber="carsNumberChange" :table="data.table"
 				:data="cars" :orderInfo="data.orderInfo" :limitTimeDiscount="data.limitTimeDiscount"
+				@changeNumber="goodsChangeNumber"
 				@clear="cleaCart"></my-car>
 		</view>
 		<!-- 套餐选择规格 -->
@@ -112,6 +113,9 @@
 			<text>历史订单</text>
 			<text class="num">{{ data.historyOrderNum }}</text>
 		</view>
+		
+		<!-- 修改购物车数量 -->
+		<popupChangeNumber v-model="popupChangeNumberData.show" :goods="popupChangeNumberData.data" @confirm="carsNumberChange"></popupChangeNumber>
 	</view>
 </template>
 <script setup>
@@ -137,6 +141,13 @@
 	import {
 		stickCount
 	} from '@/http/api/product/stick.js'
+	import popupChangeNumber from './components/popup-change-number.vue'
+	
+	const popupChangeNumberData=reactive({
+		show:false,
+		data:null
+	})
+	
 	import guigeModel from "./components/guige";
 	import taocanModel from "./components/taocanModel.vue";
 	import weighItem from "./components/weigh.vue";
@@ -845,7 +856,17 @@
 			return;
 		}
 	}
-
+	
+	
+	
+	
+	function goodsChangeNumber(e){
+		console.log(e);
+		popupChangeNumberData.data=e;
+		popupChangeNumberData.show=true
+	}
+	
+	
 	/**
 	 * socket通知购物车商品数量修改处理
 	 */
--- a/pagesOrder/detail/components/order.vue
+++ b/pagesOrder/detail/components/order.vue
@@ -43,7 +43,7 @@
 		</view>
 		<view class="u-flex u-row-between u-m-t-24 u-col-top">
 			<view class="no-wrap">打印状态</view>
-			<view class="u-p-l-32" style="max-width: 522rpx; word-wrap: break-word; color: red">
+			<view class="u-p-l-32" style="max-width: 522rpx; word-wrap: break-word; color: red" v-if="data.printStatus">
 				<template v-if="JSON.parse(data.printStatus).length > 0">
 					打印失败（{{
 						JSON.parse(data.printStatus)
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,8 +48,8 @@ importers:
        specifier: ^3.3.32
        version: 3.6.15
      ysk-utils:
-        specifier: ^1.0.82
-        version: 1.0.82
+        specifier: ^1.0.85
+        version: 1.0.85
    devDependencies:
      copy-webpack-plugin:
        specifier: ^12.0.2
@@ -120,36 +120,42 @@ packages:
    engines: {node: '>= 10.0.0'}
    cpu: [arm]
    os: [linux]
+    libc: [glibc]

  '@parcel/watcher-linux-arm-musl@2.5.1':
    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
    engines: {node: '>= 10.0.0'}
    cpu: [arm]
    os: [linux]
+    libc: [musl]

  '@parcel/watcher-linux-arm64-glibc@2.5.1':
    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
    engines: {node: '>= 10.0.0'}
    cpu: [arm64]
    os: [linux]
+    libc: [glibc]

  '@parcel/watcher-linux-arm64-musl@2.5.1':
    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
    engines: {node: '>= 10.0.0'}
    cpu: [arm64]
    os: [linux]
+    libc: [musl]

  '@parcel/watcher-linux-x64-glibc@2.5.1':
    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
    engines: {node: '>= 10.0.0'}
    cpu: [x64]
    os: [linux]
+    libc: [glibc]

  '@parcel/watcher-linux-x64-musl@2.5.1':
    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
    engines: {node: '>= 10.0.0'}
    cpu: [x64]
    os: [linux]
+    libc: [musl]

  '@parcel/watcher-win32-arm64@2.5.1':
    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
@@ -708,8 +714,8 @@ packages:
      webpack-cli:
        optional: true

-  ysk-utils@1.0.82:
-    resolution: {integrity: sha512-rIds6x9PnvNmNcAVN/uR6KbhzhElS0f79qvpsO/wPSgnTORTGyKnb6aMLPBgcfDI7SaZXUoyKdljjznXH+O+cw==}
+  ysk-utils@1.0.85:
+    resolution: {integrity: sha512-HkbV4Jidi3G6DAuGAN972tClUYtC2zVoxo4crrxexfn0rZa8HjXatUfEbawHOeEzyl6G1CdC+160I2bKfxEBlA==}

 snapshots:

@@ -1324,7 +1330,7 @@ snapshots:
      - esbuild
      - uglify-js

-  ysk-utils@1.0.82:
+  ysk-utils@1.0.85:
    dependencies:
      bignumber.js: 9.3.1
      loadsh: 0.0.4
Author	SHA1	Message	Date
gyq	4b1e8066f0	优化	2026-01-26 16:04:39 +08:00
YeMingfei666	f3bd7637b5	会员等级编辑修复	2026-01-19 10:15:25 +08:00
YeMingfei666	85354f6296	部分问题修复	2026-01-17 17:22:59 +08:00
YeMingfei666	410b0501af	增加购物车修改数量弹窗	2026-01-17 11:05:55 +08:00
YeMingfei666	b35d165f7a	Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_app into prod	2026-01-17 10:37:54 +08:00
YeMingfei666	f090d59dc6	增加购物车编辑数量功能	2026-01-17 10:36:45 +08:00