Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu

# Conflicts:
#	package-lock.json

main.js

@@ -18,7 +18,7 @@ import { createSSRApp } from 'vue'
 import App from './App.vue'
 export function createApp() {
   const app = createSSRApp(App)
-  app.use(pinia)
+  app.use(pinia)   //持久化
   return {
     app
   }

node_modules/mitt/package.json

@@ -1,64 +1,36 @@
 {
-  "name": "mitt",
+  "_from": "mitt@3.0.1",
-  "version": "3.0.1",
+  "_id": "mitt@3.0.1",
-  "description": "Tiny 200b functional Event Emitter / pubsub.",
+  "_inBundle": false,
-  "module": "dist/mitt.mjs",
+  "_integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-  "main": "dist/mitt.js",
+  "_location": "/mitt",
-  "jsnext:main": "dist/mitt.mjs",
+  "_phantomChildren": {},
-  "umd:main": "dist/mitt.umd.js",
+  "_requested": {
-  "source": "src/index.ts",
+    "type": "version",
-  "typings": "index.d.ts",
+    "registry": true,
-  "exports": {
+    "raw": "mitt@3.0.1",
-    "types": "./index.d.ts",
+    "name": "mitt",
-    "module": "./dist/mitt.mjs",
+    "escapedName": "mitt",
-    "import": "./dist/mitt.mjs",
+    "rawSpec": "3.0.1",
-    "require": "./dist/mitt.js",
+    "saveSpec": null,
-    "default": "./dist/mitt.mjs"
+    "fetchSpec": "3.0.1"
   },
-  "scripts": {
+  "_requiredBy": [
-    "test": "npm-run-all --silent typecheck lint mocha test-types",
+    "/"
-    "mocha": "mocha test",
-    "test-types": "tsc test/test-types-compilation.ts --noEmit --strict",
-    "lint": "eslint src test --ext ts --ext js",
-    "typecheck": "tsc --noEmit",
-    "bundle": "microbundle -f es,cjs,umd",
-    "build": "npm-run-all --silent clean -p bundle -s docs",
-    "clean": "rimraf dist",
-    "docs": "documentation readme src/index.ts --section API -q --parse-extension ts",
-    "release": "npm run -s build -s && npm t && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish"
-  },
-  "repository": "developit/mitt",
-  "keywords": [
-    "events",
-    "eventemitter",
-    "emitter",
-    "pubsub"
   ],
-  "homepage": "https://github.com/developit/mitt",
+  "_resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz",
+  "_shasum": "ea36cf0cc30403601ae074c8f77b7092cdab36d1",
+  "_spec": "mitt@3.0.1",
+  "_where": "D:\\jiangchengfeiyi-xiaochengxu",
   "authors": [
     "Jason Miller <jason@developit.ca>"
   ],
-  "license": "MIT",
+  "bugs": {
-  "files": [
+    "url": "https://github.com/developit/mitt/issues"
-    "dist",
-    "index.d.ts"
-  ],
-  "mocha": {
-    "extension": [
-      "ts"
-    ],
-    "require": [
-      "ts-node/register",
-      "esm"
-    ],
-    "spec": [
-      "test/*_test.ts"
-    ]
-  },
-  "prettier": {
-    "singleQuote": true,
-    "trailingComma": "none"
   },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "Tiny 200b functional Event Emitter / pubsub.",
   "devDependencies": {
     "@types/chai": "^4.2.11",
     "@types/mocha": "^7.0.2",
@@ -81,5 +53,64 @@
     "sinon-chai": "^3.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
-  }
+  },
+  "exports": {
+    "types": "./index.d.ts",
+    "module": "./dist/mitt.mjs",
+    "import": "./dist/mitt.mjs",
+    "require": "./dist/mitt.js",
+    "default": "./dist/mitt.mjs"
+  },
+  "files": [
+    "dist",
+    "index.d.ts"
+  ],
+  "homepage": "https://github.com/developit/mitt",
+  "jsnext:main": "dist/mitt.mjs",
+  "keywords": [
+    "events",
+    "eventemitter",
+    "emitter",
+    "pubsub"
+  ],
+  "license": "MIT",
+  "main": "dist/mitt.js",
+  "mocha": {
+    "extension": [
+      "ts"
+    ],
+    "require": [
+      "ts-node/register",
+      "esm"
+    ],
+    "spec": [
+      "test/*_test.ts"
+    ]
+  },
+  "module": "dist/mitt.mjs",
+  "name": "mitt",
+  "prettier": {
+    "singleQuote": true,
+    "trailingComma": "none"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/developit/mitt.git"
+  },
+  "scripts": {
+    "build": "npm-run-all --silent clean -p bundle -s docs",
+    "bundle": "microbundle -f es,cjs,umd",
+    "clean": "rimraf dist",
+    "docs": "documentation readme src/index.ts --section API -q --parse-extension ts",
+    "lint": "eslint src test --ext ts --ext js",
+    "mocha": "mocha test",
+    "release": "npm run -s build -s && npm t && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish",
+    "test": "npm-run-all --silent typecheck lint mocha test-types",
+    "test-types": "tsc test/test-types-compilation.ts --noEmit --strict",
+    "typecheck": "tsc --noEmit"
+  },
+  "source": "src/index.ts",
+  "typings": "index.d.ts",
+  "umd:main": "dist/mitt.umd.js",
+  "version": "3.0.1"
 }

package-lock.json

@@ -81,9 +81,17 @@
         "node": ">= 18"
       }
     },
+<<<<<<< .mine
     "node_modules/mitt": {
       "version": "3.0.1",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+
+=======
+    "mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+>>>>>>> .theirs
     },
     "node_modules/regenerator-runtime": {
       "version": "0.14.1",

pages/Shopping-cart/productmain/productmain.vue

@@ -146,9 +146,9 @@ const stateText = ref({
 onShow(()=>{
 	getProductCart() //获取商品类
 })
-// onLoad(()=>{
+onLoad(()=>{
-// 	getProductCart() //再获取一次实体类商品的列表
+	getProductCart() //再获取一次实体类商品的列表
-// })
+})
 //小程序刷新根据用户id获取购物车信息
 const getProductCart = async ()=>{
 	const res = await uni.request({

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js

@@ -16,6 +16,9 @@ const _sfc_main = {
     common_vendor.onShow(() => {
       getProductCart();
     });
+    common_vendor.onLoad(() => {
+      getProductCart();
+    });
     const getProductCart = async () => {
       const res = await common_vendor.index.request({
         url: api_request.baseUrl + "/cart/list",