55

node_modules/.bin/uuid

@@ -2,15 +2,14 @@
 basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
 
 case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
 esac
 
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../uuid/dist/bin/uuid" "$@"
+  "$basedir/node"  "$basedir/../uuid/dist/bin/uuid" "$@"
+  ret=$?
 else 
-  exec node  "$basedir/../uuid/dist/bin/uuid" "$@"
+  node  "$basedir/../uuid/dist/bin/uuid" "$@"
+  ret=$?
 fi
+exit $ret

node_modules/.bin/uuid.cmd

@@ -1,9 +1,4 @@
 @ECHO off
-GOTO start
-:find_dp0
-SET dp0=%~dp0
-EXIT /b
-:start
 SETLOCAL
 CALL :find_dp0
 
@@ -14,4 +9,9 @@ IF EXIST "%dp0%\node.exe" (
   SET PATHEXT=%PATHEXT:;.JS;=;%
 )
 
-endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\uuid\dist\bin\uuid" %*
+"%_prog%"  "%dp0%\..\uuid\dist\bin\uuid" %*
+ENDLOCAL
+EXIT /b %errorlevel%
+:find_dp0
+SET dp0=%~dp0
+EXIT /b

node_modules/.bin/uuid.ps1

@@ -9,20 +9,10 @@ if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
 }
 $ret=0
 if (Test-Path "$basedir/node$exe") {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "$basedir/node$exe"  "$basedir/../uuid/dist/bin/uuid" $args
-  } else {
-    & "$basedir/node$exe"  "$basedir/../uuid/dist/bin/uuid" $args
-  }
+  & "$basedir/node$exe"  "$basedir/../uuid/dist/bin/uuid" $args
   $ret=$LASTEXITCODE
 } else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../uuid/dist/bin/uuid" $args
-  } else {
-    & "node$exe"  "$basedir/../uuid/dist/bin/uuid" $args
-  }
+  & "node$exe"  "$basedir/../uuid/dist/bin/uuid" $args
   $ret=$LASTEXITCODE
 }
 exit $ret

node_modules/dayjs/package.json

@@ -1,55 +1,39 @@
 {
-  "name": "dayjs",
-  "version": "1.11.11",
-  "description": "2KB immutable date time library alternative to Moment.js with the same modern API ",
-  "main": "dayjs.min.js",
-  "types": "index.d.ts",
-  "scripts": {
-    "test": "TZ=Pacific/Auckland npm run test-tz && TZ=Europe/London npm run test-tz && TZ=America/Whitehorse npm run test-tz && npm run test-tz && jest",
-    "test-tz": "date && jest test/timezone.test --coverage=false",
-    "lint": "./node_modules/.bin/eslint src/* test/* build/*",
-    "prettier": "prettier --write \"docs/**/*.md\"",
-    "babel": "cross-env BABEL_ENV=build babel src --out-dir esm --copy-files && node build/esm",
-    "build": "cross-env BABEL_ENV=build node build && npm run size",
-    "sauce": "npx karma start karma.sauce.conf.js",
-    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2  && npm run sauce -- 3",
-    "size": "size-limit && gzip-size dayjs.min.js"
-  },
-  "pre-commit": [
-    "lint"
-  ],
-  "size-limit": [
-    {
-      "limit": "2.99 KB",
-      "path": "dayjs.min.js"
-    }
-  ],
-  "jest": {
-    "roots": [
-      "test"
-    ],
-    "testRegex": "test/(.*?/)?.*test.js$",
-    "testURL": "http://localhost",
-    "coverageDirectory": "./coverage/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "src/**/*"
+  "_args": [
+    [
+      "dayjs@1.11.11",
+      "D:\\xiaoling\\CBB3"
     ]
+  ],
+  "_from": "dayjs@1.11.11",
+  "_id": "dayjs@1.11.11",
+  "_inBundle": false,
+  "_integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==",
+  "_location": "/dayjs",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "dayjs@1.11.11",
+    "name": "dayjs",
+    "escapedName": "dayjs",
+    "rawSpec": "1.11.11",
+    "saveSpec": null,
+    "fetchSpec": "1.11.11"
   },
-  "keywords": [
-    "dayjs",
-    "date",
-    "time",
-    "immutable",
-    "moment"
+  "_requiredBy": [
+    "/"
   ],
-  "author": "iamkun",
-  "license": "MIT",
-  "homepage": "https://day.js.org",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iamkun/dayjs.git"
+  "_resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
+  "_spec": "1.11.11",
+  "_where": "D:\\xiaoling\\CBB3",
+  "author": {
+    "name": "iamkun"
+  },
+  "bugs": {
+    "url": "https://github.com/iamkun/dayjs/issues"
   },
+  "description": "2KB immutable date time library alternative to Moment.js with the same modern API ",
   "devDependencies": {
     "@babel/cli": "^7.0.0-beta.44",
     "@babel/core": "^7.0.0-beta.44",
@@ -80,5 +64,54 @@
     "rollup-plugin-terser": "^7.0.2",
     "size-limit": "^0.18.0",
     "typescript": "^2.8.3"
-  }
+  },
+  "homepage": "https://day.js.org",
+  "jest": {
+    "roots": [
+      "test"
+    ],
+    "testRegex": "test/(.*?/)?.*test.js$",
+    "testURL": "http://localhost",
+    "coverageDirectory": "./coverage/",
+    "collectCoverage": true,
+    "collectCoverageFrom": [
+      "src/**/*"
+    ]
+  },
+  "keywords": [
+    "dayjs",
+    "date",
+    "time",
+    "immutable",
+    "moment"
+  ],
+  "license": "MIT",
+  "main": "dayjs.min.js",
+  "name": "dayjs",
+  "pre-commit": [
+    "lint"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iamkun/dayjs.git"
+  },
+  "scripts": {
+    "babel": "cross-env BABEL_ENV=build babel src --out-dir esm --copy-files && node build/esm",
+    "build": "cross-env BABEL_ENV=build node build && npm run size",
+    "lint": "eslint src/* test/* build/*",
+    "prettier": "prettier --write \"docs/**/*.md\"",
+    "sauce": "npx karma start karma.sauce.conf.js",
+    "size": "size-limit && gzip-size dayjs.min.js",
+    "test": "TZ=Pacific/Auckland npm run test-tz && TZ=Europe/London npm run test-tz && TZ=America/Whitehorse npm run test-tz && npm run test-tz && jest",
+    "test-tz": "date && jest test/timezone.test --coverage=false",
+    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2  && npm run sauce -- 3"
+  },
+  "size-limit": [
+    {
+      "limit": "2.99 KB",
+      "path": "dayjs.min.js"
+    }
+  ],
+  "types": "index.d.ts",
+  "version": "1.11.11"
 }

node_modules/image-tools/package.json

@@ -1,25 +1,55 @@
 {
-  "name": "image-tools",
-  "version": "1.4.0",
-  "description": "图像转换工具，可用于如下环境：uni-app、微信小程序、5+APP、浏览器",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhetengbiji/image-tools.git"
+  "_args": [
+    [
+      "image-tools@1.4.0",
+      "D:\\xiaoling\\CBB3"
+    ]
+  ],
+  "_from": "image-tools@1.4.0",
+  "_id": "image-tools@1.4.0",
+  "_inBundle": false,
+  "_integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==",
+  "_location": "/image-tools",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "image-tools@1.4.0",
+    "name": "image-tools",
+    "escapedName": "image-tools",
+    "rawSpec": "1.4.0",
+    "saveSpec": null,
+    "fetchSpec": "1.4.0"
   },
-  "keywords": [
-    "base64"
+  "_requiredBy": [
+    "/"
   ],
-  "author": "Shengqiang Guo",
-  "license": "ISC",
+  "_resolved": "https://mirrors.huaweicloud.com/repository/npm/image-tools/-/image-tools-1.4.0.tgz",
+  "_spec": "1.4.0",
+  "_where": "D:\\xiaoling\\CBB3",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
   "bugs": {
     "url": "https://github.com/zhetengbiji/image-tools/issues"
   },
-  "homepage": "https://github.com/zhetengbiji/image-tools#readme",
+  "description": "图像转换工具，可用于如下环境：uni-app、微信小程序、5+APP、浏览器",
   "devDependencies": {
     "@types/html5plus": "^1.0.0"
-  }
+  },
+  "homepage": "https://github.com/zhetengbiji/image-tools#readme",
+  "keywords": [
+    "base64"
+  ],
+  "license": "ISC",
+  "main": "index.js",
+  "name": "image-tools",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/image-tools.git"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "1.4.0"
 }

node_modules/recorder-core/package.json

@@ -1,9 +1,40 @@
 {
-  "name": "recorder-core",
-  "version": "1.3.24040900",
+  "_args": [
+    [
+      "recorder-core@1.3.24040900",
+      "D:\\xiaoling\\CBB3"
+    ]
+  ],
+  "_from": "recorder-core@1.3.24040900",
+  "_id": "recorder-core@1.3.24040900",
+  "_inBundle": false,
+  "_integrity": "sha512-QVOXHqrQhQ5FMgXTKh4P7oc31Qex2Q5skgBT972+0wrtwHr76zMnrybo48/VyUhS75whRxMFJ5yQpv+wj333Bw==",
+  "_location": "/recorder-core",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "recorder-core@1.3.24040900",
+    "name": "recorder-core",
+    "escapedName": "recorder-core",
+    "rawSpec": "1.3.24040900",
+    "saveSpec": null,
+    "fetchSpec": "1.3.24040900"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://mirrors.huaweicloud.com/repository/npm/recorder-core/-/recorder-core-1.3.24040900.tgz",
+  "_spec": "1.3.24040900",
+  "_where": "D:\\xiaoling\\CBB3",
+  "author": {
+    "name": "xiangyuecn"
+  },
+  "bugs": {
+    "url": "https://github.com/xiangyuecn/Recorder/issues"
+  },
   "description": "Recorder库: html5 js 录音 mp3 wav ogg webm amr g711a g711u 格式，支持pc和Android、iOS部分浏览器、Hybrid App（提供Android iOS App源码）、微信，提供ASR语音识别转文字 H5版语音通话聊天示例 DTMF编码解码",
   "homepage": "https://github.com/xiangyuecn/Recorder",
-  "main": "src/recorder-core.js",
   "keywords": [
     "recorder",
     "recordapp",
@@ -20,13 +51,12 @@
     "recording",
     "webrtc"
   ],
+  "license": "MIT",
+  "main": "src/recorder-core.js",
+  "name": "recorder-core",
   "repository": {
     "type": "git",
-    "url": "https://github.com/xiangyuecn/Recorder.git"
-  },
-  "bugs": {
-    "url": "https://github.com/xiangyuecn/Recorder/issues"
+    "url": "git+https://github.com/xiangyuecn/Recorder.git"
   },
-  "author": "xiangyuecn",
-  "license": "MIT"
-}
+  "version": "1.3.24040900"
+}

node_modules/uuid/package.json

@@ -1,43 +1,35 @@
 {
-  "name": "uuid",
-  "version": "9.0.1",
-  "description": "RFC4122 (v1, v4, and v5) UUIDs",
-  "funding": [
-    "https://github.com/sponsors/broofa",
-    "https://github.com/sponsors/ctavan"
-  ],
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
+  "_args": [
+    [
+      "uuid@9.0.1",
+      "D:\\xiaoling\\CBB3"
     ]
+  ],
+  "_from": "uuid@9.0.1",
+  "_id": "uuid@9.0.1",
+  "_inBundle": false,
+  "_integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+  "_location": "/uuid",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "uuid@9.0.1",
+    "name": "uuid",
+    "escapedName": "uuid",
+    "rawSpec": "9.0.1",
+    "saveSpec": null,
+    "fetchSpec": "9.0.1"
   },
-  "keywords": [
-    "uuid",
-    "guid",
-    "rfc4122"
+  "_requiredBy": [
+    "/"
   ],
-  "license": "MIT",
+  "_resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
+  "_spec": "9.0.1",
+  "_where": "D:\\xiaoling\\CBB3",
   "bin": {
-    "uuid": "./dist/bin/uuid"
+    "uuid": "dist/bin/uuid"
   },
-  "sideEffects": false,
-  "main": "./dist/index.js",
-  "exports": {
-    ".": {
-      "node": {
-        "module": "./dist/esm-node/index.js",
-        "require": "./dist/index.js",
-        "import": "./wrapper.mjs"
-      },
-      "browser": {
-        "import": "./dist/esm-browser/index.js",
-        "require": "./dist/commonjs-browser/index.js"
-      },
-      "default": "./dist/esm-browser/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "module": "./dist/esm-node/index.js",
   "browser": {
     "./dist/md5.js": "./dist/md5-browser.js",
     "./dist/native.js": "./dist/native-browser.js",
@@ -45,14 +37,15 @@
     "./dist/sha1.js": "./dist/sha1-browser.js",
     "./dist/esm-node/index.js": "./dist/esm-browser/index.js"
   },
-  "files": [
-    "CHANGELOG.md",
-    "CONTRIBUTING.md",
-    "LICENSE.md",
-    "README.md",
-    "dist",
-    "wrapper.mjs"
-  ],
+  "bugs": {
+    "url": "https://github.com/uuidjs/uuid/issues"
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "description": "RFC4122 (v1, v4, and v5) UUIDs",
   "devDependencies": {
     "@babel/cli": "7.18.10",
     "@babel/core": "7.18.10",
@@ -78,6 +71,51 @@
     "runmd": "1.3.9",
     "standard-version": "9.5.0"
   },
+  "exports": {
+    ".": {
+      "node": {
+        "module": "./dist/esm-node/index.js",
+        "require": "./dist/index.js",
+        "import": "./wrapper.mjs"
+      },
+      "browser": {
+        "import": "./dist/esm-browser/index.js",
+        "require": "./dist/commonjs-browser/index.js"
+      },
+      "default": "./dist/esm-browser/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "LICENSE.md",
+    "README.md",
+    "dist",
+    "wrapper.mjs"
+  ],
+  "funding": [
+    "https://github.com/sponsors/broofa",
+    "https://github.com/sponsors/ctavan"
+  ],
+  "homepage": "https://github.com/uuidjs/uuid#readme",
+  "keywords": [
+    "uuid",
+    "guid",
+    "rfc4122"
+  ],
+  "license": "MIT",
+  "lint-staged": {
+    "*.{js,jsx,json,md}": [
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix"
+    ]
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/esm-node/index.js",
+  "name": "uuid",
   "optionalDevDependencies": {
     "@wdio/browserstack-service": "7.16.10",
     "@wdio/cli": "7.16.10",
@@ -86,50 +124,44 @@
     "@wdio/spec-reporter": "7.16.9",
     "@wdio/static-server-service": "7.16.6"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/uuidjs/uuid.git"
+  },
   "scripts": {
-    "examples:browser:webpack:build": "cd examples/browser-webpack && npm install && npm run build",
+    "build": "./scripts/build.sh",
+    "bundlewatch": "npm run pretest:browser && bundlewatch --config bundlewatch.config.json",
+    "docs": "( node --version | grep -q 'v18' ) && ( npm run build && npx runmd --output=README.md README_js.md )",
+    "docs:diff": "npm run docs && git diff --quiet README.md",
+    "eslint:check": "eslint src/ test/ examples/ *.js",
+    "eslint:fix": "eslint --fix src/ test/ examples/ *.js",
     "examples:browser:rollup:build": "cd examples/browser-rollup && npm install && npm run build",
+    "examples:browser:webpack:build": "cd examples/browser-webpack && npm install && npm run build",
     "examples:node:commonjs:test": "cd examples/node-commonjs && npm install && npm test",
     "examples:node:esmodules:test": "cd examples/node-esmodules && npm install && npm test",
     "examples:node:jest:test": "cd examples/node-jest && npm install && npm test",
-    "prepare": "cd $( git rev-parse --show-toplevel ) && husky install",
     "lint": "npm run eslint:check && npm run prettier:check",
-    "eslint:check": "eslint src/ test/ examples/ *.js",
-    "eslint:fix": "eslint --fix src/ test/ examples/ *.js",
+    "md": "runmd --watch --output=README.md README_js.md",
+    "prepack": "npm run build",
+    "prepare": "cd $( git rev-parse --show-toplevel ) && husky install",
     "pretest": "[ -n $CI ] || npm run build",
-    "test": "BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/",
+    "pretest:benchmark": "npm run build",
     "pretest:browser": "optional-dev-dependency && npm run build && npm-run-all --parallel examples:browser:**",
-    "test:browser": "wdio run ./wdio.conf.js",
     "pretest:node": "npm run build",
-    "test:node": "npm-run-all --parallel examples:node:**",
-    "test:pack": "./scripts/testpack.sh",
-    "pretest:benchmark": "npm run build",
-    "test:benchmark": "cd examples/benchmark && npm install && npm test",
     "prettier:check": "prettier --check '**/*.{js,jsx,json,md}'",
     "prettier:fix": "prettier --write '**/*.{js,jsx,json,md}'",
-    "bundlewatch": "npm run pretest:browser && bundlewatch --config bundlewatch.config.json",
-    "md": "runmd --watch --output=README.md README_js.md",
-    "docs": "( node --version | grep -q 'v18' ) && ( npm run build && npx runmd --output=README.md README_js.md )",
-    "docs:diff": "npm run docs && git diff --quiet README.md",
-    "build": "./scripts/build.sh",
-    "prepack": "npm run build",
-    "release": "standard-version --no-verify"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/uuidjs/uuid.git"
-  },
-  "lint-staged": {
-    "*.{js,jsx,json,md}": [
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix"
-    ]
+    "release": "standard-version --no-verify",
+    "test": "BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/",
+    "test:benchmark": "cd examples/benchmark && npm install && npm test",
+    "test:browser": "wdio run ./wdio.conf.js",
+    "test:node": "npm-run-all --parallel examples:node:**",
+    "test:pack": "./scripts/testpack.sh"
   },
+  "sideEffects": false,
   "standard-version": {
     "scripts": {
       "postchangelog": "prettier --write CHANGELOG.md"
     }
-  }
+  },
+  "version": "9.0.1"
 }

package-lock.json

@@ -1,49 +1,8 @@
 {
     "name": "MaoUI 文字向上滚动 多行滚动 多行滑动",
     "version": "1.2",
-    "lockfileVersion": 2,
+    "lockfileVersion": 1,
     "requires": true,
-    "packages": {
-        "": {
-            "name": "MaoUI 文字向上滚动 多行滚动 多行滑动",
-            "version": "1.2",
-            "dependencies": {
-                "dayjs": "^1.11.11",
-                "image-tools": "^1.4.0",
-                "recorder-core": "^1.3.24040900",
-                "uuid": "^9.0.1"
-            }
-        },
-        "node_modules/dayjs": {
-            "version": "1.11.11",
-            "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
-            "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
-        },
-        "node_modules/image-tools": {
-            "version": "1.4.0",
-            "resolved": "https://mirrors.huaweicloud.com/repository/npm/image-tools/-/image-tools-1.4.0.tgz",
-            "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==",
-            "license": "ISC"
-        },
-        "node_modules/recorder-core": {
-            "version": "1.3.24040900",
-            "resolved": "https://mirrors.huaweicloud.com/repository/npm/recorder-core/-/recorder-core-1.3.24040900.tgz",
-            "integrity": "sha512-QVOXHqrQhQ5FMgXTKh4P7oc31Qex2Q5skgBT972+0wrtwHr76zMnrybo48/VyUhS75whRxMFJ5yQpv+wj333Bw==",
-            "license": "MIT"
-        },
-        "node_modules/uuid": {
-            "version": "9.0.1",
-            "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
-            "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-            "funding": [
-                "https://github.com/sponsors/broofa",
-                "https://github.com/sponsors/ctavan"
-            ],
-            "bin": {
-                "uuid": "dist/bin/uuid"
-            }
-        }
-    },
     "dependencies": {
         "dayjs": {
             "version": "1.11.11",

pages.json

@@ -18,7 +18,7 @@
 		{
 			"path": "pages/chat/index",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "部门群聊",
 				"navigationStyle": "custom"
 			}
 		},
@@ -501,14 +501,14 @@
 		{
 			"path": "pages/guild/index",
 			"style": {
-				"navigationBarTitleText": "我的会馆",
+				"navigationBarTitleText": "机制说明",
 				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/guild/itemIndex",
 			"style": {
-				"navigationBarTitleText": "我的会馆",
+				"navigationBarTitleText": "机制说明",
 				"navigationStyle": "custom"
 			}
 		},
@@ -933,14 +933,14 @@
 			"pagePath": "pages/guild/index",
 			"iconPath": "static/tab/store.png",
 			"selectedIconPath": "static/tab/store_btn.png",
-			"text": "我的会馆"
+			"text": "机制说明"
 		},
 		
 		{
 			"pagePath": "pages/chat/index",
 			"iconPath": "static/tab/cate.png",
 			"selectedIconPath": "static/tab/cate-btn.png",
-			"text": "客服中心"
+			"text": "部门群聊"
 		},
 		
 		

pages/chat/group/info/groupInfo.vue

@@ -125,12 +125,12 @@
 		</view>
 		
 		
-		<view class="list-item" style="margin-top: 10px;">
+		<!-- <view class="list-item" style="margin-top: 10px;">
 			<view class="item fx-r fx-bc fx-ac" style="padding: 20px 0;" @tap="tapDelet">
 				<view class="label">删除退出</view>
 			</view>
 			
-		</view>
+		</view> -->
 		
 	</view>
 </template>
@@ -336,9 +336,7 @@
 				tapDelet:function(){
 					this.utils.showModal("你确定要退出群聊吗？", ()=>{
 						uni.showLoading({ title:"提交数据中..." });
-						this
-							.request
-							.post("chatGroupRemove",{groupId:this.groupId})
+						this.request.post("chatGroupRemove",{groupId:this.groupId})
 							.then(res=>{
 								uni.hideLoading();
 								if(res.code == 200) {

pages/guild/index.vue

@@ -69,7 +69,7 @@
 							
 							<view class="item fx-h fx-bc fx-ac">
 								<view class="label">{{ data.guData.nickname }}</view>
-								<view class="name">馆长</view>
+								<view class="name">部门总监</view>
 							</view>
 							
 							<view class="halving"></view>

pages/guild/proItem.vue

@@ -386,6 +386,7 @@
 					.post("auctionProRush",post)
 					.then(res=>{
 						uni.hideLoading();
+						console.log(res,'88888')
 						if(res.code == 200) {
 							if(res.data.state == 1) {
 								uni.redirectTo({

pages/index/index.vue

@@ -78,7 +78,7 @@
 						<view class="top fx-r fx-bc">
 							<view class="label">CBB潮贝抢货通道</view>
 							<view class="fx-g1"></view>
-							<view class="sbtn">更多CBB代理团队 ></view>
+							<!-- <view class="sbtn">更多CBB代理团队 ></view> -->
 						</view>
 
 						<view class="team-show">
@@ -107,7 +107,7 @@
 
 									<view class="item fx-h fx-bc fx-ac">
 										<view class="label">{{ guData.nickname }}</view>
-										<view class="name">馆长</view>
+										<view class="name">部门总监</view>
 									</view>
 
 									<view class="halving"></view>
@@ -129,7 +129,7 @@
 					</view>
 
 					<!--文票系统-->
-					<view class="tradeweb">
+					<!-- <view class="tradeweb">
 						<view class="bg">
 							<image src="/static/img/wen_bg.png"></image>
 						</view>
@@ -144,14 +144,14 @@
 							</view>
 							<view class="v">近24小时涨跌幅</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 
 				<!--提货好物-->
 				<view class="goods">
 					<view class="top fx-r fx-bc fx-ac">
 						<image class="icon" src="/static/img/goods-icon.png"></image>
-						<view class="label">提货好物</view>
+						<view class="label">货款提货</view>
 						<view class="fx-g1"></view>
 						<view class="more fx-r fx-bc fx-ac" @tap="tapOpen" data-url="../goods/list">
 							<view class="text">更多</view>
@@ -185,7 +185,7 @@
 				<view class="shop" v-if="sysData.is_audit == 0">
 					<view class="top fx-r fx-bc fx-ac">
 						<image class="icon" src="/static/img/shop-icon.png"></image>
-						<view class="label">最新门店</view>
+						<view class="label">易趣C果园({{merchantData.length}}家)</view>
 						<view class="fx-g1"></view>
 						<view class="more fx-r fx-bc fx-ac" @tap="tapOpen" data-url="../merchant/list">
 							<view class="text">更多</view>

pages/user/index.vue

@@ -62,7 +62,7 @@
 
 					<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/detail">
 						<view class="count">{{ user != null ? user.good_integral : 0 }}</view>
-						<view class="name">提货积分</view>
+						<view class="name">货款提货积分</view>
 					</view>
 
 				</view>
@@ -74,7 +74,7 @@
 			<image class="bg" src="/static/img/gz-bg.png"></image>
 			<view class="inner fx-r fx-bc">
 				<image class="icon" src="/static/img/gz-zuan.png"></image>
-				<view class="name">馆长中心</view>
+				<view class="name">部门总监职能中心</view>
 				<view class="fx-g1"></view>
 				<view class="sbtn">点击进入</view>
 			</view>
@@ -102,7 +102,7 @@
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/guild/order/order"
 						v-if="sysData.is_audit == 0">
 						<image src="/static/img/user-rush.png"></image>
-						<view class="name">抢购订单</view>
+						<view class="name">购买订单</view>
 					</view>