Merge branch '最低经销价格' into testToMerge

# Conflicts:
#	package-lock.json
#	src/components/newLayout/index.vue

package-lock.json

@@ -473,9 +473,15 @@
       }
     },
     "@babel/compat-data": {
+<<<<<<< HEAD
       "version": "7.26.2",
       "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.26.2.tgz",
       "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.26.3.tgz",
+      "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
+>>>>>>> 最低经销价格
       "dev": true
     },
     "@babel/core": {
@@ -513,6 +519,7 @@
       }
     },
     "@babel/generator": {
+<<<<<<< HEAD
       "version": "7.26.2",
       "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.26.2.tgz",
       "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
@@ -520,6 +527,15 @@
       "requires": {
         "@babel/parser": "^7.26.2",
         "@babel/types": "^7.26.0",
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.26.3.tgz",
+      "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.26.3",
+        "@babel/types": "^7.26.3",
+>>>>>>> 最低经销价格
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -534,6 +550,7 @@
         "@babel/types": "^7.25.9"
       }
     },
+<<<<<<< HEAD
     "@babel/helper-builder-binary-assignment-operator-visitor": {
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
@@ -544,6 +561,8 @@
         "@babel/types": "^7.25.9"
       }
     },
+=======
+>>>>>>> 最低经销价格
     "@babel/helper-compilation-targets": {
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
@@ -573,13 +592,19 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
+<<<<<<< HEAD
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
       "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
-        "regexpu-core": "^6.1.1",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       }
     },
@@ -664,6 +689,7 @@
         "@babel/traverse": "^7.25.9"
       }
     },
+<<<<<<< HEAD
     "@babel/helper-simple-access": {
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
@@ -674,6 +700,8 @@
         "@babel/types": "^7.25.9"
       }
     },
+=======
+>>>>>>> 最低经销价格
     "@babel/helper-skip-transparent-expression-wrappers": {
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
@@ -765,11 +793,19 @@
       }
     },
     "@babel/parser": {
+<<<<<<< HEAD
       "version": "7.26.2",
       "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.2.tgz",
       "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
       "requires": {
         "@babel/types": "^7.26.0"
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+      "requires": {
+        "@babel/types": "^7.26.3"
+>>>>>>> 最低经销价格
       }
     },
     "@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
@@ -1062,12 +1098,20 @@
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
+<<<<<<< HEAD
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
       "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
       "dev": true,
       "requires": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
+      "dev": true,
+      "requires": {
+>>>>>>> 最低经销价格
         "@babel/helper-plugin-utils": "^7.25.9"
       }
     },
@@ -1148,6 +1192,7 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
+<<<<<<< HEAD
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
       "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
@@ -1156,6 +1201,15 @@
         "@babel/helper-module-transforms": "^7.25.9",
         "@babel/helper-plugin-utils": "^7.25.9",
         "@babel/helper-simple-access": "^7.25.9"
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
+>>>>>>> 最低经销价格
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
@@ -1386,9 +1440,15 @@
       }
     },
     "@babel/plugin-transform-typescript": {
+<<<<<<< HEAD
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz",
       "integrity": "sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==",
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.3.tgz",
+      "integrity": "sha512-6+5hpdr6mETwSKjmJUdYw0EIkATiQhnELWlE3kJFBwSg/BGIVwVaVbX+gOXBCdc7Ln1RXZxyWGecIXhUfnl7oA==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
@@ -1545,6 +1605,7 @@
       }
     },
     "@babel/traverse": {
+<<<<<<< HEAD
       "version": "7.25.9",
       "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.25.9.tgz",
       "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
@@ -1553,16 +1614,32 @@
         "@babel/code-frame": "^7.25.9",
         "@babel/generator": "^7.25.9",
         "@babel/parser": "^7.25.9",
+=======
+      "version": "7.26.4",
+      "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.26.4.tgz",
+      "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.3",
+        "@babel/parser": "^7.26.3",
+>>>>>>> 最低经销价格
         "@babel/template": "^7.25.9",
-        "@babel/types": "^7.25.9",
+        "@babel/types": "^7.26.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
+<<<<<<< HEAD
       "version": "7.26.0",
       "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.26.0.tgz",
       "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+=======
+      "version": "7.26.3",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+>>>>>>> 最低经销价格
       "requires": {
         "@babel/helper-string-parser": "^7.25.9",
         "@babel/helper-validator-identifier": "^7.25.9"
@@ -1647,9 +1724,15 @@
       }
     },
     "@codemirror/language": {
+<<<<<<< HEAD
       "version": "6.10.5",
       "resolved": "https://registry.npmmirror.com/@codemirror/language/-/language-6.10.5.tgz",
       "integrity": "sha512-sECWJyNmwqw6mSO6Qf0IVPHwhEnuYbqHBZaaIbdcXtZ6Y2r5vU/dxgC7K1ppWaJFy8XGtTBC0Pd60qI7NfJreQ==",
+=======
+      "version": "6.10.6",
+      "resolved": "https://registry.npmmirror.com/@codemirror/language/-/language-6.10.6.tgz",
+      "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==",
+>>>>>>> 最低经销价格
       "requires": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -1660,9 +1743,15 @@
       }
     },
     "@codemirror/lint": {
+<<<<<<< HEAD
       "version": "6.8.3",
       "resolved": "https://registry.npmmirror.com/@codemirror/lint/-/lint-6.8.3.tgz",
       "integrity": "sha512-GSGfKxCo867P7EX1k2LoCrjuQFeqVgPGRRsSl4J4c0KMkD+k1y6WYvTQkzv0iZ8JhLJDujEvlnMchv4CZQLh3Q==",
+=======
+      "version": "6.8.4",
+      "resolved": "https://registry.npmmirror.com/@codemirror/lint/-/lint-6.8.4.tgz",
+      "integrity": "sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==",
+>>>>>>> 最低经销价格
       "requires": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.35.0",
@@ -1685,9 +1774,15 @@
       "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
     },
     "@codemirror/view": {
+<<<<<<< HEAD
       "version": "6.35.0",
       "resolved": "https://registry.npmmirror.com/@codemirror/view/-/view-6.35.0.tgz",
       "integrity": "sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==",
+=======
+      "version": "6.35.2",
+      "resolved": "https://registry.npmmirror.com/@codemirror/view/-/view-6.35.2.tgz",
+      "integrity": "sha512-u04R04XFCYCNaHoNRr37WUUAfnxKPwPdqV+370NiO6i85qB1J/qCD/WbbMJsyJfRWhXIJXAe2BG/oTzAggqv4A==",
+>>>>>>> 最低经销价格
       "requires": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -1707,6 +1802,7 @@
       "dev": true
     },
     "@csstools/media-query-list-parser": {
+<<<<<<< HEAD
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz",
       "integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==",
@@ -1716,6 +1812,17 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
       "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
+=======
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz",
+      "integrity": "sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==",
+      "dev": true
+    },
+    "@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+>>>>>>> 最低经销价格
       "dev": true
     },
     "@discoveryjs/json-ext": {
@@ -1896,9 +2003,15 @@
       }
     },
     "@lezer/javascript": {
+<<<<<<< HEAD
       "version": "1.4.19",
       "resolved": "https://registry.npmmirror.com/@lezer/javascript/-/javascript-1.4.19.tgz",
       "integrity": "sha512-j44kbR1QL26l6dMunZ1uhKBFteVGLVCBGNUD2sUaMnic+rbTviVuoK0CD1l9FTW31EueWvFFswCKMH7Z+M3JRA==",
+=======
+      "version": "1.4.21",
+      "resolved": "https://registry.npmmirror.com/@lezer/javascript/-/javascript-1.4.21.tgz",
+      "integrity": "sha512-lL+1fcuxWYPURMM/oFZLEDm0XuLN128QPV+VuGtKpeaOGdcl9F2LYC3nh1S9LkPqx9M0mndZFdXCipNAZpzIkQ==",
+>>>>>>> 最低经销价格
       "requires": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -2356,9 +2469,15 @@
       "dev": true
     },
     "@types/node": {
+<<<<<<< HEAD
       "version": "22.10.0",
       "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.10.0.tgz",
       "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
+=======
+      "version": "22.10.1",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.10.1.tgz",
+      "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "undici-types": "~6.20.0"
@@ -4662,17 +4781,38 @@
       "dev": true
     },
     "call-bind": {
+<<<<<<< HEAD
       "version": "1.0.7",
       "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.7.tgz",
       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "requires": {
+=======
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.0",
+>>>>>>> 最低经销价格
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
+<<<<<<< HEAD
         "set-function-length": "^1.2.1"
       }
     },
+=======
+        "set-function-length": "^1.2.2"
+      }
+    },
+    "call-bind-apply-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.0.tgz",
+      "integrity": "sha512-CCKAP2tkPau7D3GE8+V8R6sQubA9R5foIzGp+85EXCVSCivuxBNAWqcpn72PKYiIcqoViv/kcUDpaEIMBVi1lQ==",
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      }
+    },
+>>>>>>> 最低经销价格
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
@@ -4707,9 +4847,15 @@
       }
     },
     "caniuse-lite": {
+<<<<<<< HEAD
       "version": "1.0.30001684",
       "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
       "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
+=======
+      "version": "1.0.30001687",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz",
+      "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==",
+>>>>>>> 最低经销价格
       "dev": true
     },
     "canvg": {
@@ -5939,6 +6085,19 @@
         "minimatch": "^3.0.4"
       }
     },
+<<<<<<< HEAD
+=======
+    "dunder-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.0.tgz",
+      "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      }
+    },
+>>>>>>> 最低经销价格
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
@@ -5963,9 +6122,15 @@
       "dev": true
     },
     "electron-to-chromium": {
+<<<<<<< HEAD
       "version": "1.5.66",
       "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.66.tgz",
       "integrity": "sha512-pI2QF6+i+zjPbqRzJwkMvtvkdI7MjVbSh2g8dlMguDJIXEPw+kwasS1Jl+YGPEBfGVxsVgGUratAKymPdPo2vQ==",
+=======
+      "version": "1.5.71",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
+      "integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
+>>>>>>> 最低经销价格
       "dev": true
     },
     "element-ui": {
@@ -6173,6 +6338,7 @@
           "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.3.tgz",
           "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA=="
         }
+<<<<<<< HEAD
       }
     },
     "es-define-property": {
@@ -6183,6 +6349,15 @@
         "get-intrinsic": "^1.2.4"
       }
     },
+=======
+      }
+    },
+    "es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="
+    },
+>>>>>>> 最低经销价格
     "es-errors": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
@@ -7086,9 +7261,15 @@
       }
     },
     "express": {
+<<<<<<< HEAD
       "version": "4.21.1",
       "resolved": "https://registry.npmmirror.com/express/-/express-4.21.1.tgz",
       "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+=======
+      "version": "4.21.2",
+      "resolved": "https://registry.npmmirror.com/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "accepts": "~1.3.8",
@@ -7110,7 +7291,11 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
+<<<<<<< HEAD
         "path-to-regexp": "0.1.10",
+=======
+        "path-to-regexp": "0.1.12",
+>>>>>>> 最低经销价格
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -7467,6 +7652,7 @@
       "dev": true
     },
     "get-intrinsic": {
+<<<<<<< HEAD
       "version": "1.2.4",
       "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
@@ -7476,6 +7662,20 @@
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
+=======
+      "version": "1.2.5",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.5.tgz",
+      "integrity": "sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg==",
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "dunder-proto": "^1.0.0",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2"
+>>>>>>> 最低经销价格
       }
     },
     "get-stream": {
@@ -7608,12 +7808,18 @@
       "dev": true
     },
     "gopd": {
+<<<<<<< HEAD
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "requires": {
         "get-intrinsic": "^1.1.3"
       }
+=======
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="
+>>>>>>> 最低经销价格
     },
     "graceful-fs": {
       "version": "4.2.11",
@@ -7676,6 +7882,7 @@
       }
     },
     "has-proto": {
+<<<<<<< HEAD
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.3.tgz",
       "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
@@ -7684,6 +7891,19 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+=======
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "requires": {
+        "dunder-proto": "^1.0.0"
+      }
+    },
+    "has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="
+>>>>>>> 最低经销价格
     },
     "has-tostringtag": {
       "version": "1.0.2",
@@ -8091,6 +8311,7 @@
       "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
       "requires": {
         "has-tostringtag": "^1.0.0"
+<<<<<<< HEAD
       }
     },
     "is-bigint": {
@@ -8101,6 +8322,18 @@
         "has-bigints": "^1.0.1"
       }
     },
+=======
+      }
+    },
+    "is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "requires": {
+        "has-bigints": "^1.0.2"
+      }
+    },
+>>>>>>> 最低经销价格
     "is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -8111,12 +8344,21 @@
       }
     },
     "is-boolean-object": {
+<<<<<<< HEAD
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
       "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "requires": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
+=======
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.0.tgz",
+      "integrity": "sha512-kR5g0+dXf/+kXnqI+lu0URKYPKgICtHGGNCDSB10AaUFj3o/HkB3u7WfpRBJGFopxxY0oH3ux7ZsDjLtK7xqvw==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "has-tostringtag": "^1.0.2"
+>>>>>>> 最低经销价格
       }
     },
     "is-buffer": {
@@ -8236,6 +8478,7 @@
       "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
+<<<<<<< HEAD
     },
     "is-number-object": {
       "version": "1.0.7",
@@ -8245,6 +8488,18 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+=======
+    },
+    "is-number-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.1.0.tgz",
+      "integrity": "sha512-KVSZV0Dunv9DTPkhXwcZ3Q+tUc9TsaE1ZwX5J2WMvsSGS6Md8TFPun5uwh0yRdrNerI6vf/tbJxqSx4c1ZI1Lw==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+>>>>>>> 最低经销价格
     "is-plain-obj": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
@@ -8288,6 +8543,7 @@
       "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true
+<<<<<<< HEAD
     },
     "is-string": {
       "version": "1.0.7",
@@ -8305,6 +8561,28 @@
         "has-symbols": "^1.0.2"
       }
     },
+=======
+    },
+    "is-string": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-string/-/is-string-1.1.0.tgz",
+      "integrity": "sha512-PlfzajuF9vSo5wErv3MJAKD/nqf9ngAs1NFQYm16nUYFO2IzxJ2hcm+IOCg+EEopdykNNUhVq5cz35cAUxU8+g==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "has-tostringtag": "^1.0.2"
+      }
+    },
+    "is-symbol": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.1.0.tgz",
+      "integrity": "sha512-qS8KkNNXUZ/I+nX6QT8ZS1/Yx0A444yhzdTKxCzKkNjQ9sHErBxJnJAgh+f5YhusYECEcjo4XcyH87hn6+ks0A==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "has-symbols": "^1.0.3",
+        "safe-regex-test": "^1.0.3"
+      }
+    },
+>>>>>>> 最低经销价格
     "is-typed-array": {
       "version": "1.1.13",
       "resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.13.tgz",
@@ -8601,6 +8879,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
       "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+<<<<<<< HEAD
       "dev": true
     },
     "known-css-properties": {
@@ -8609,6 +8888,16 @@
       "integrity": "sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==",
       "dev": true
     },
+=======
+      "dev": true
+    },
+    "known-css-properties": {
+      "version": "0.35.0",
+      "resolved": "https://registry.npmmirror.com/known-css-properties/-/known-css-properties-0.35.0.tgz",
+      "integrity": "sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==",
+      "dev": true
+    },
+>>>>>>> 最低经销价格
     "launch-editor": {
       "version": "2.9.1",
       "resolved": "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.9.1.tgz",
@@ -9832,9 +10121,15 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
+<<<<<<< HEAD
       "version": "0.1.10",
       "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
       "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+=======
+      "version": "0.1.12",
+      "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+>>>>>>> 最低经销价格
       "dev": true
     },
     "path-type": {
@@ -10263,9 +10558,15 @@
       "dev": true
     },
     "preact": {
+<<<<<<< HEAD
       "version": "10.25.0",
       "resolved": "https://registry.npmmirror.com/preact/-/preact-10.25.0.tgz",
       "integrity": "sha512-6bYnzlLxXV3OSpUxLdaxBmE7PMOu0aR3pG6lryK/0jmvcDFPlcXGQAt5DpK3RITWiDrfYZRI0druyaK/S9kYLg=="
+=======
+      "version": "10.25.1",
+      "resolved": "https://registry.npmmirror.com/preact/-/preact-10.25.1.tgz",
+      "integrity": "sha512-frxeZV2vhQSohQwJ7FvlqC40ze89+8friponWUFeVEkaCfhC6Eu4V0iND5C9CXz8JLndV07QRDeXzH1+Anz5Og=="
+>>>>>>> 最低经销价格
     },
     "prelude-ls": {
       "version": "1.2.1",
@@ -10531,6 +10832,7 @@
       }
     },
     "reflect.getprototypeof": {
+<<<<<<< HEAD
       "version": "1.0.7",
       "resolved": "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz",
       "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==",
@@ -10542,6 +10844,20 @@
         "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
         "which-builtin-type": "^1.1.4"
+=======
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz",
+      "integrity": "sha512-B5dj6usc5dkk8uFliwjwDHM8To5/QwdKz9JcBZ8Ic4G1f0YmeeJTtE/ZTdgRFPAfxZFiUaPhZ1Jcs4qeagItGQ==",
+      "requires": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "dunder-proto": "^1.0.0",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.2.0",
+        "which-builtin-type": "^1.2.0"
+>>>>>>> 最低经销价格
       }
     },
     "regenerate": {
@@ -10806,9 +11122,15 @@
       "dev": true
     },
     "sass-loader": {
+<<<<<<< HEAD
       "version": "16.0.3",
       "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-16.0.3.tgz",
       "integrity": "sha512-gosNorT1RCkuCMyihv6FBRR7BMV06oKRAs+l4UMp1mlcVg9rWN6KMmUj3igjQwmYys4mDP3etEYJgiHRbgHCHA==",
+=======
+      "version": "16.0.4",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-16.0.4.tgz",
+      "integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
+>>>>>>> 最低经销价格
       "requires": {
         "neo-async": "^2.6.2"
       }
@@ -11230,9 +11552,15 @@
       }
     },
     "sortablejs": {
+<<<<<<< HEAD
       "version": "1.15.5",
       "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.5.tgz",
       "integrity": "sha512-xDJLosRJzZ+nVnjaUYmO9H/wZth0lWTRq7VzV1eQyDSKsvxmoJ69HTGcwnwGYpJG/AkJ9OWiwWH4BhIycdonWw=="
+=======
+      "version": "1.15.6",
+      "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.6.tgz",
+      "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A=="
+>>>>>>> 最低经销价格
     },
     "source-map": {
       "version": "0.1.32",
@@ -11492,6 +11820,7 @@
       }
     },
     "stylelint": {
+<<<<<<< HEAD
       "version": "16.10.0",
       "resolved": "https://registry.npmmirror.com/stylelint/-/stylelint-16.10.0.tgz",
       "integrity": "sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==",
@@ -11501,12 +11830,23 @@
         "@csstools/css-tokenizer": "^3.0.1",
         "@csstools/media-query-list-parser": "^3.0.1",
         "@csstools/selector-specificity": "^4.0.0",
+=======
+      "version": "16.11.0",
+      "resolved": "https://registry.npmmirror.com/stylelint/-/stylelint-16.11.0.tgz",
+      "integrity": "sha512-zrl4IrKmjJQ+h9FoMp69UMCq5SxeHk0URhxUBj4d3ISzo/DplOFBJZc7t7Dr6otB+1bfbbKNLOmCDpzKSlW+Nw==",
+      "dev": true,
+      "requires": {
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3",
+        "@csstools/media-query-list-parser": "^4.0.2",
+        "@csstools/selector-specificity": "^5.0.0",
+>>>>>>> 最低经销价格
         "@dual-bundle/import-meta-resolve": "^4.1.0",
         "balanced-match": "^2.0.0",
         "colord": "^2.9.3",
         "cosmiconfig": "^9.0.0",
         "css-functions-list": "^3.2.3",
-        "css-tree": "^3.0.0",
+        "css-tree": "^3.0.1",
         "debug": "^4.3.7",
         "fast-glob": "^3.3.2",
         "fastest-levenshtein": "^1.0.16",
@@ -11518,16 +11858,16 @@
         "ignore": "^6.0.2",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.34.0",
+        "known-css-properties": "^0.35.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^13.2.0",
         "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
-        "picocolors": "^1.0.1",
-        "postcss": "^8.4.47",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.49",
         "postcss-resolve-nested-selector": "^0.1.6",
         "postcss-safe-parser": "^7.0.1",
-        "postcss-selector-parser": "^6.1.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "string-width": "^4.2.3",
@@ -11562,12 +11902,21 @@
           }
         },
         "css-tree": {
+<<<<<<< HEAD
           "version": "3.0.1",
           "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-3.0.1.tgz",
           "integrity": "sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==",
           "dev": true,
           "requires": {
             "mdn-data": "2.12.1",
+=======
+          "version": "3.1.0",
+          "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-3.1.0.tgz",
+          "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.12.2",
+>>>>>>> 最低经销价格
             "source-map-js": "^1.0.1"
           }
         },
@@ -11606,11 +11955,29 @@
           }
         },
         "mdn-data": {
+<<<<<<< HEAD
           "version": "2.12.1",
           "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.12.1.tgz",
           "integrity": "sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==",
           "dev": true
         },
+=======
+          "version": "2.12.2",
+          "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.12.2.tgz",
+          "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
+          "dev": true
+        },
+        "postcss-selector-parser": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+          "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+>>>>>>> 最低经销价格
         "resolve-from": {
           "version": "5.0.0",
           "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -11716,9 +12083,15 @@
       }
     },
     "table": {
+<<<<<<< HEAD
       "version": "6.8.2",
       "resolved": "https://registry.npmmirror.com/table/-/table-6.8.2.tgz",
       "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
+=======
+      "version": "6.9.0",
+      "resolved": "https://registry.npmmirror.com/table/-/table-6.9.0.tgz",
+      "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
@@ -11793,9 +12166,15 @@
       }
     },
     "terser": {
+<<<<<<< HEAD
       "version": "5.36.0",
       "resolved": "https://registry.npmmirror.com/terser/-/terser-5.36.0.tgz",
       "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
+=======
+      "version": "5.37.0",
+      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.37.0.tgz",
+      "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "@jridgewell/source-map": "^0.3.3",
@@ -13447,16 +13826,22 @@
       "dev": true
     },
     "webpack": {
+<<<<<<< HEAD
       "version": "5.96.1",
       "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.96.1.tgz",
       "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+=======
+      "version": "5.97.1",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
+>>>>>>> 最低经销价格
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
         "acorn": "^8.14.0",
         "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
@@ -13746,6 +14131,7 @@
       }
     },
     "which-boxed-primitive": {
+<<<<<<< HEAD
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
@@ -13788,6 +14174,50 @@
         "is-weakset": "^2.0.3"
       }
     },
+=======
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/which-boxed-primitive/-/which-boxed-primitive-1.1.0.tgz",
+      "integrity": "sha512-Ei7Miu/AXe2JJ4iNF5j/UphAgRoma4trE6PtisM09bPygb3egMH3YLW/befsWb1A1AxvNSFidOFTB18XtnIIng==",
+      "requires": {
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.0",
+        "is-number-object": "^1.1.0",
+        "is-string": "^1.1.0",
+        "is-symbol": "^1.1.0"
+      }
+    },
+    "which-builtin-type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/which-builtin-type/-/which-builtin-type-1.2.0.tgz",
+      "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      }
+    },
+    "which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "requires": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      }
+    },
+>>>>>>> 最低经销价格
     "which-typed-array": {
       "version": "1.1.16",
       "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.16.tgz",

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -251,7 +251,7 @@
               !scope.column.data[scope.column.columnname] &&
               scope.column.data[[scope.column.columnname]] !== 0 &&
               scope.column.columnname != 'operation' &&
-              scope.column.columnname != 'countPrice'&&
+              scope.column.columnname != 'countPrice' &&
               scope.column.columnname != 'model'
             "
           >
@@ -416,7 +416,10 @@ export default {
       this.totalPrice = this.tool.formatAmount(this.totalPrice, 2);
       this.list = res.data;
       this.total = res.total;
-      this.$refs.addProduct.doLayout();
+      try {
+         this.$refs.addProduct.doLayout();
+      } catch (error) {
+      }
       this.$emit("priceChange");
     },
     /*修改数量*/

src/HDrpManagement/salerpriceData/components/balanceDetail.vue

@@ -63,7 +63,7 @@
                   scope.column.data.county
                 }}
               </span>
-              <spna v-else>--</spna>
+              <span v-else>--</span>
             </p>
             <p v-else-if="scope.column.columnname === 'balance'">
               {{

src/components/newLayout/index.vue

@@ -108,14 +108,17 @@ export default {
         clearTimeout(this.timer);
       }
       this.timer = setTimeout(() => {
-        let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 40 - 1;
-        if (this.$refs.menu.$refs.menuList.$el.clientHeight === 80) {
-          this.divTop =
-            this.$refs.menu.$refs.menuList.$el.clientHeight - 25 * size + "px";
-        } else {
-          this.divTop = 0 + "px";
+        if (this.$refs.menu) {
+          let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 40 - 1;
+          if (this.$refs.menu.$refs.menuList.$el.clientHeight === 80) {
+            this.divTop =
+              this.$refs.menu.$refs.menuList.$el.clientHeight -
+              25 * size +
+              "px";
+          } else {
+            this.divTop = 0 + "px";
+          }
         }
-
         /* this.divHeight = (this.$refs.divContent.clientHeight - this.$refs.menu.$refs.menuList.$el.clientHeight + 10) + 'px'*/
         /* if (this.$refs.menu.$el.clientWidth < 1206 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true

src/components/newLayout/modules/navRight.vue

@@ -1,82 +1,98 @@
 <template>
   <div>
     <div class="nav-right">
-       <el-menu
-          :collapse="true"
-          style="background:none"
-          text-color="#fff"
-          active-text-color="#fff"
-          class="el-menu-vertical-demo">
-          <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')">
-            <img width="20" :src="require(`@/assets/icons/${item.systemappid}.svg`)" alt="">
-            <span slot="title">{{item.meta.title}}</span>
-          </el-menu-item>
-        </el-menu>
+      <el-menu
+        :collapse="true"
+        style="background: none"
+        text-color="#fff"
+        active-text-color="#fff"
+        class="el-menu-vertical-demo"
+      >
+        <el-menu-item
+          :index="String(index + 10)"
+          v-for="(item, index) in menuApp"
+          :key="index"
+          @click="handelMenuAppClick(item, 'app')"
+        >
+          <img
+            width="20"
+            :src="require(`@/assets/icons/${item.systemappid}.svg`)"
+            alt=""
+          />
+          <span slot="title">{{ item.meta.title }}</span>
+        </el-menu-item>
+      </el-menu>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  data () {
+  data() {
     return {
-      menuApp:[],
-      modules:[],
-      system:[]
-    }
+      menuApp: [],
+      modules: [],
+      system: [],
+    };
   },
-  methods:{
-     // 查询右侧应用授权
-    async query_userauth () {
+  methods: {
+    // 查询右侧应用授权
+    async query_userauth() {
       const res = await this.$api.requested({
-        "classname": "sysmanage.develop.userauthforweb.userauth",
-        "method": "query_userauth",
-        "content": {
-          "place":2
-        }
-      })
-      this.system = res.data
-
-      this.modules = []
-      res.data.map(e=>{
-        this.modules = [...this.modules,...e.modules]
-      })
-      this.modules.map(e=>{
-        this.menuApp =[...this.menuApp,...e.apps]
-      })
+        classname: "sysmanage.develop.userauthforweb.userauth",
+        method: "query_userauth",
+        content: {
+          place: 2,
+        },
+      });
+      console.log("res", res);
+      if (res.code == 1) {
+        this.system = res.data;
+        this.modules = [];
+        res.data.map((e) => {
+          this.modules = [...this.modules, ...e.modules];
+        });
+        this.modules.map((e) => {
+          this.menuApp = [...this.menuApp, ...e.apps];
+        });
+      }
     },
-    handelMenuAppClick (app,type) {
-      this.$store.dispatch('changeDetailDrawer',false)
-      let at_modules = this.modules.filter(e=>{
-        if (e.systemmoduleid === app.systemmoduleid)
-        return e
-      })[0]
+    handelMenuAppClick(app, type) {
+      this.$store.dispatch("changeDetailDrawer", false);
+      let at_modules = this.modules.filter((e) => {
+        if (e.systemmoduleid === app.systemmoduleid) return e;
+      })[0];
 
-      let at_app = app
+      let at_app = app;
 
-      sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
-      const link = ()=>{
-        this.$router.push({path:app.path})
-      }
-      this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:'',link})
-      this.$router.push({path:app.path})
+      sessionStorage.setItem("active_modules", JSON.stringify(at_modules));
+      const link = () => {
+        this.$router.push({ path: app.path });
+      };
+      this.$store.dispatch("setActiveApp", {
+        name: app.name,
+        app: at_app,
+        val: "",
+        link,
+      });
+      this.$router.push({ path: app.path });
     },
   },
-  mounted () {
-    this.query_userauth()
-  }
-}
-
+  mounted() {
+    this.query_userauth();
+  },
+};
 </script>
 <style>
 </style>
 <style scoped>
-.nav-right{
-  position:fixed;
-  right:0;
-  top:0;
-  height:100%;
-  background:rgba(0, 0,0,.3);z-index:2000;
+.nav-right {
+  position: fixed;
+  right: 0;
+  top: 0;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.3);
+  z-index: 2000;
   z-index: 2003;
 }
 </style>

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -76,8 +76,11 @@
             <td class="text1" style="height: 100%;"><span>{{ Object.keys(product).length ? product.itemno||'-' : '' }}</span></td>
         </tr>
         <tr>
-            <td class="title">{{$t(product.itemno?'牌价':'预估价格')}}</td>
-            <td class="text2">￥{{ Object.keys(product).length ? tool.formatAmount(product.price,2) : 'xxxxxx' }}</td>
+            <td class="title">{{$t(product.itemno?'牌价':'最低经销价')}}</td>
+            <td class="text2">
+                ￥{{ Object.keys(product).length ? tool.formatAmount(product.price,2) : 'xxxxxx' }}
+                <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
+            </td>
         </tr>
     </table>
 </template>

src/optionSystem/selectOption/components/DieFa.vue

@@ -721,13 +721,14 @@
             </td>
           </tr>
           <tr>
-            <td class="title">{{ $t(product.itemno ? "牌价" : "预估价格") }}</td>
+            <td class="title">{{ $t(product.itemno ? "牌价" : "最低经销价") }}</td>
             <td class="text2">
               ￥{{
                 Object.keys(product).length
                   ? tool.formatAmount(product.price, 2)
                   : "xxxxxx"
               }}
+                <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
             </td>
           </tr>
         </table>

src/optionSystem/selectOption/components/setOrder.vue

@@ -245,9 +245,10 @@
         <td class="text1">{{ result.itemno || "-" }}</td>
       </tr>
       <tr>
-        <td class="title">{{ $t(result.itemno ? "牌价" : "预估价格") }}</td>
+        <td class="title">{{ $t(result.itemno ? "牌价" : "最低经销价") }}</td>
         <td class="text2">
           ￥{{ result.price ? tool.formatAmount(result.price, 2) : "xxxxxx" }}
+          <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
         </td>
       </tr>
     </table>
@@ -284,10 +285,12 @@ export default {
 <style scoped>
 /deep/.el-dialog__header {
   display: none;
+  
 }
 /deep/.el-dialog__body {
   padding: 5px !important;
 }
+
 .descript {
   font-size: 12px;
   color: red;

src/optionSystem/valveOption/DieFa.vue

@@ -993,7 +993,7 @@
             <td class="title" style="padding: 0" colspan="2">
           <tr class="price-tr">
             <td class="title" style="width: 120px !important">
-              {{ $t(product.itemno ? "牌价" : "预估价格") }}
+              {{ $t(product.itemno ? "牌价" : "最低经销价") }}
             </td>
             <td class="text2">
               ￥{{
@@ -1001,6 +1001,7 @@
                     ? tool.formatAmount(product.price, 2)
                     : "xxxxxx"
               }}
+              <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
             </td>
             <td class="title">{{$t('成本价格')}}</td>
             <td class="text2">

src/template/addProduct/index.vue

@@ -140,6 +140,13 @@ export default {
       this.total = res.total
       this.$refs.tableTemp.$refs.table.doLayout()
     },
+    doLayout(){
+      try {
+        this.$refs.tableTemp.$refs.table.doLayout()
+      } catch (error) {
+        
+      }
+    },
     /*获取品牌*/
     async queryBrands () {
       const res = await this.$api.requested({

src/views/message/index.vue

@@ -4,377 +4,410 @@
       <el-col :span="12">
         <div class="left">
           <div class="select">
-            <div >
+            <div>
               <el-button-group>
-                <el-button size="small" :type="currentItem==1?'primary':''" @click="selectFun('应用')">{{$t('应用消息')}}</el-button>
-                <el-button size="small" :type="currentItem==0?'primary':''" @click="selectFun('系统')">{{$t('系统消息')}}</el-button>
+                <el-button
+                  size="small"
+                  :type="currentItem == 1 ? 'primary' : ''"
+                  @click="selectFun('应用')"
+                  >{{ $t("应用消息") }}</el-button
+                >
+                <el-button
+                  size="small"
+                  :type="currentItem == 0 ? 'primary' : ''"
+                  @click="selectFun('系统')"
+                  >{{ $t("系统消息") }}</el-button
+                >
               </el-button-group>
-<!--              <div @click="selectFun('应用')"
+              <!--              <div @click="selectFun('应用')"
                    :style="currentItem==1 ? 'background:#3874F6;color:#ffffff;vertical-align: middle;line-height: 30px;height: 30px' : 'border:1px solid #cccccc;vertical-align: middle;line-height: 30px;height: 30px'">应用消息</div>
               <div @click="selectFun('系统')"
                    :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>-->
             </div>
             <div class="select_right">
-              <el-button @click="allRead" size="small">{{$t('全部标为已读')}}</el-button>
+              <el-button @click="allRead" size="small">{{
+                $t("全部标为已读")
+              }}</el-button>
             </div>
           </div>
           <el-row style="margin-top: 10px">
-            <el-col :span="14" >
-              <div style="margin-left: 16px;font-size: 14px">
-                {{$t('总计')}}：{{total}}
+            <el-col :span="14">
+              <div style="margin-left: 16px; font-size: 14px">
+                {{ $t("总计") }}：{{ total }}
               </div>
             </el-col>
             <el-col :span="10">
-              <div style="float: right;margin-right: 16px;">
-                  <el-switch
-                      style="z-index: 9999"
-                      v-model="isRead"
-                      :active-text="$t('只看未读')"
-                      active-value="1"
-                      inactive-value="0"
-                      @change="readChange"
-                  >
-                  </el-switch>
+              <div style="float: right; margin-right: 16px">
+                <el-switch
+                  style="z-index: 9999"
+                  v-model="isRead"
+                  :active-text="$t('只看未读')"
+                  active-value="1"
+                  inactive-value="0"
+                  @change="readChange"
+                >
+                </el-switch>
               </div>
             </el-col>
           </el-row>
 
-          <list class="list" :list="list" @messageItemClick="messageItemClick" ref="list"></list>
+          <list
+            class="list"
+            :list="list"
+            @messageItemClick="messageItemClick"
+            ref="list"
+          ></list>
 
-          <pagination  :total="total" :pageSize="param.content.pageSize"  :currentPage="param.content.pageNumber"
-                       @pageChange="pageChange">
+          <pagination
+            :total="total"
+            :pageSize="param.content.pageSize"
+            :currentPage="param.content.pageNumber"
+            @pageChange="pageChange"
+          >
           </pagination>
-
         </div>
       </el-col>
       <el-col :span="12">
         <div class="right" v-if="message">
-          <p class="title">{{message.title}}</p>
+          <p class="title">{{ message.title }}</p>
           <p class="info">
-            <span>{{$t('发布于')}}:{{message.createdate}} | {{message.name || message.type}}</span>
+            <span
+              >{{ $t("发布于") }}:{{ message.createdate }} |
+              {{ message.name || message.type }}</span
+            >
           </p>
           <div class="content-txt">
-<!--            <p class="txt">{{message.message}}</p>-->
+            <!--            <p class="txt">{{message.message}}</p>-->
             <p class="txt">
-              <span v-for="(item,index) in message.message">
-              <span v-if="index === message.message.length -1">{{$t(item)}}</span>
-              <span v-else>{{item + ';'}}<br></span>
-            </span>
+              <span v-for="(item, index) in message.message">
+                <span v-if="index === message.message.length - 1">{{
+                  $t(item)
+                }}</span>
+                <span v-else>{{ item + ";" }}<br /></span>
+              </span>
+            </p>
+            <p
+              class="link"
+              @click="goDetail"
+              v-if="currentItem == 1 && message.link"
+            >
+              {{ $t("请前往") }} {{ message.title }}>>
             </p>
-            <p class="link" @click="goDetail" v-if="currentItem == 1 && message.link">{{$t('请前往')}} {{message.title}}>></p>
           </div>
         </div>
       </el-col>
     </el-row>
-
   </div>
 </template>
 
 <script>
-import list from '@/views/message/components/list'
+import list from "@/views/message/components/list";
 
-import pagination from '@/components/pagination/Pagination1'
+import pagination from "@/components/pagination/Pagination1";
 export default {
-  name: '',
-  data () {
+  name: "",
+  data() {
     return {
       currentItem: 1,
-      isRead:'0',
+      isRead: "0",
       param: {
-        "classname": "system.message.Message",
-        "method": "queryMessage",
-        "content": {
-          "nocache": true,
-          "pageNumber": 1,
-          "pageSize": 15,
-          "isread":'',
-          "type": '',
-          "where": {
-            "isread":''
-          }
-        }
+        classname: "system.message.Message",
+        method: "queryMessage",
+        content: {
+          nocache: true,
+          pageNumber: 1,
+          pageSize: 15,
+          isread: "",
+          type: "",
+          where: {
+            isread: "",
+          },
+        },
       },
       list: [],
       total: 0,
-      message:'',
-      isAllClick: true
+      message: "",
+      isAllClick: true,
     };
   },
   components: { list, pagination },
-  computed: {
-  },
-  watch: {
-  },
-  created () {
-    this.getMessageList()
+  computed: {},
+  watch: {},
+  created() {
+    this.getMessageList();
   },
   methods: {
-    async getMessageList () {
-      this.param.content.type = this.currentItem == 0 ? '系统' : '应用'
-      let res = await this.$api.requested(this.param)
-      res.data.forEach(item => {
-        this.isCategory(item)
-      })
-      this.list = res.data
+    async getMessageList() {
+      this.param.content.type = this.currentItem == 0 ? "系统" : "应用";
+      let res = await this.$api.requested(this.param);
+      if (res.code == 1) {
+        res.data.forEach((item) => {
+          this.isCategory(item);
+        });
+        this.list = res.data;
 
-      this.list.forEach(item=>{
-        item.message = item.message.split("；")
-      })
-      this.message = ''
-      if(this.list[0]) this.messageItemClick(this.list[0])
-      this.total = res.total
+        this.list.forEach((item) => {
+          item.message = item.message.split("；");
+        });
+        this.message = "";
+        if (this.list[0]) this.messageItemClick(this.list[0]);
+        this.total = res.total;
+      }
     },
-    selectFun (data) {
-      this.message = ''
-      this.param.content.pageNumber = 1
-      this.currentItem = data == '系统' ? 0 : 1
-      this.getMessageList()
+    selectFun(data) {
+      this.message = "";
+      this.param.content.pageNumber = 1;
+      this.currentItem = data == "系统" ? 0 : 1;
+      this.getMessageList();
     },
-    pageChange (n) {
-      this.$refs.list.$refs.listScroll.scrollTop = 0
-      this.param.content.pageNumber = n
-      this.getMessageList()
+    pageChange(n) {
+      this.$refs.list.$refs.listScroll.scrollTop = 0;
+      this.param.content.pageNumber = n;
+      this.getMessageList();
     },
     async messageItemClick(data) {
       let res = await this.$api.requested({
-      "classname":"system.message.Message",
-      "method":"readMessage",
-      "content":{
-              "nocache":true,
-              "messageid":data.messageid
-          }
-        })
-      data.isread = 1
-      res.data.name = data.name
-      res.data.link = data.link
-      res.data.modules = data.modules
-      this.message = res.data
-      this.message.message = this.message.message.split("；")
+        classname: "system.message.Message",
+        method: "readMessage",
+        content: {
+          nocache: true,
+          messageid: data.messageid,
+        },
+      });
+      data.isread = 1;
+      res.data.name = data.name;
+      res.data.link = data.link;
+      res.data.modules = data.modules;
+      this.message = res.data;
+      this.message.message = this.message.message.split("；");
     },
     async allRead() {
-      if(!this.isAllClick) return
+      if (!this.isAllClick) return;
       let res = await this.$api.requested({
-      "classname":"system.message.Message",
-      "method":"readAllMessage",
-      "content":{
-        "nocache":true,
-      }
-      })
-      this.tool.showMessage(res,() => {
-        this.list.forEach(item => {
-          item.isread = 1
-        })
-        this.isAllClick = false
+        classname: "system.message.Message",
+        method: "readAllMessage",
+        content: {
+          nocache: true,
+        },
+      });
+      this.tool.showMessage(res, () => {
+        this.list.forEach((item) => {
+          item.isread = 1;
+        });
+        this.isAllClick = false;
         setTimeout(() => {
-          this.isAllClick = true
-        },5000)
-      })
+          this.isAllClick = true;
+        }, 5000);
+      });
     },
     //跳转到消息具体页面
     goDetail() {
-      sessionStorage.setItem('active_modules',JSON.stringify(this.message.modules))
-      console.log(this.message.link,'link')
-      console.log(this.message,'message')
-     /* this.$router.push(this.message.link.listPath)*/
-      if (this.message.objectname === 'sat_orderclueuploadbill'){
+      sessionStorage.setItem(
+        "active_modules",
+        JSON.stringify(this.message.modules)
+      );
+      console.log(this.message.link, "link");
+      console.log(this.message, "message");
+      /* this.$router.push(this.message.link.listPath)*/
+      if (this.message.objectname === "sat_orderclueuploadbill") {
         setTimeout(() => {
-          this.$store.dispatch('changeDetailDrawer',false)
-          let route = this.$route
+          this.$store.dispatch("changeDetailDrawer", false);
+          let route = this.$route;
 
-          this.oldRoute = {path:route.path,query:route.query}
-          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+          this.oldRoute = { path: route.path, query: route.query };
+          this.$store.dispatch("setHistoryRouter", this.oldRoute);
 
           this.$router.push({
-            path:'/clue_public',
-            query:{
-              id:this.message.objectid,
-              portrait:''
-            }
-          })
-        })
-      }else {
+            path: "/clue_public",
+            query: {
+              id: this.message.objectid,
+              portrait: "",
+            },
+          });
+        });
+      } else {
         if (this.message.link.detail) {
           setTimeout(() => {
-            this.$store.dispatch('changeDetailDrawer',true)
-            let route = this.$route
+            this.$store.dispatch("changeDetailDrawer", true);
+            let route = this.$route;
             if (route.path !== this.message.link.detail.slice(0)) {
-              this.oldRoute = {path:route.path,query:route.query}
-              this.$store.dispatch('setHistoryRouter',this.oldRoute)
+              this.oldRoute = { path: route.path, query: route.query };
+              this.$store.dispatch("setHistoryRouter", this.oldRoute);
             }
             this.$router.push({
-              path:this.message.link.detail,
-              query:{
-                id:this.message.objectid,
-                portrait:''
-              }
-            })
-          })
-        }else {
+              path: this.message.link.detail,
+              query: {
+                id: this.message.objectid,
+                portrait: "",
+              },
+            });
+          });
+        } else {
           switch (this.message.link.listPath) {
-            case '/workreport':
+            case "/workreport":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-                  break
-            case '/notice_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/notice_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/notice_mag_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/notice_mag_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/submitedit_one':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/submitedit_one":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/submitedit_more':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/submitedit_more":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/submit_mag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/submit_mag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archvies_mag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archvies_mag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_admag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_admag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_adlist':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_adlist":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_adclass':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_adclass":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_sc_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_sc_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_scmag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_scmag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
+                path: this.message.link.listPath,
+              });
+              break;
           }
         }
       }
-
-
     },
-    readChange(){
-      this.isRead == '1'?this.param.content.isread = 0:this.param.content.isread = ''
-      this.getMessageList()
+    readChange() {
+      this.isRead == "1"
+        ? (this.param.content.isread = 0)
+        : (this.param.content.isread = "");
+      this.getMessageList();
     },
 
     isCategory(data) {
-      JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-        item1.modules.forEach(item2 => {
-          item2.apps.forEach(item3 => {
-            if(item3.systemappid == data.systemappid) {
-              data.modules = item3
-              data.link = {listPath:item3.path,detail:item3.path_index}
-              return
+      JSON.parse(sessionStorage.getItem("module_info")).forEach((item1) => {
+        item1.modules.forEach((item2) => {
+          item2.apps.forEach((item3) => {
+            if (item3.systemappid == data.systemappid) {
+              data.modules = item3;
+              data.link = { listPath: item3.path, detail: item3.path_index };
+              return;
             }
-          })
-        })
-      })
+          });
+        });
+      });
 
-//       switch (data.objectname) {
-//         case 'sat_courseware':
-//             data.name = '商学院'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_sharematerial':
-//             data.name = '推广素材'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_notice':
-//             data.name = '通告'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_submitedit':
-//             data.name = '提报'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_orderclue':
-//             data.name = '销售线索'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sys_attachment':
-//             data.name = '营销物料'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//       }
-    }
+      //       switch (data.objectname) {
+      //         case 'sat_courseware':
+      //             data.name = '商学院'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_sharematerial':
+      //             data.name = '推广素材'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_notice':
+      //             data.name = '通告'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_submitedit':
+      //             data.name = '提报'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_orderclue':
+      //             data.name = '销售线索'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sys_attachment':
+      //             data.name = '营销物料'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //       }
+    },
   },
 };
 </script>
@@ -390,12 +423,11 @@ export default {
   /*min-height: calc(100vh - 199px);
   max-height: calc(100vh - 199px);*/
   height: calc(100vh - 120px);
-
 }
 .message .left {
   position: relative;
   padding: 20px 0 60px 0;
-  box-shadow: 1px 0px 0px 1px #DDDDDD;
+  box-shadow: 1px 0px 0px 1px #dddddd;
   background: #ffffff;
   height: calc(100vh - 120px);
   /*min-height: calc(100vh - 199px);
@@ -460,9 +492,9 @@ export default {
   color: #666666;
 }
 .message .right .content-txt .link {
-  margin-top:16px;
-  color:#3874F6;
-  font-size:14px;
+  margin-top: 16px;
+  color: #3874f6;
+  font-size: 14px;
   cursor: pointer;
 }
 /* .message .right .content-txt p:last-child {
@@ -477,6 +509,6 @@ export default {
   position: absolute;
   left: 50%;
   top: 50%;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
 }
 </style>

src/views/salesData/components/balanceDetail.vue

@@ -22,7 +22,7 @@
               <span v-if="scope.column.data.province && scope.column.data.city && scope.column.data.county">
                 {{scope.column.data.province+'-'+scope.column.data.city+'-'+scope.column.data.county}}
               </span>
-              <spna v-else>--</spna>
+              <span v-else>--</span>
             </p>
             <p v-else-if="scope.column.columnname === 'balance'">
               {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}