From 093fd7d554ae52a461a8b9f51f72f66d8ed6bc77 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 12 Jul 2021 14:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AD=89=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4userId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                  | 102 ++++++++++++++---------------
 package.json                       |   1 -
 src/components/Header.vue          |  25 +++----
 src/utils/api.js                   |  50 +++++++-------
 src/views/customer/AddCustomer.vue |  14 ++--
 src/views/data/Framework.vue       |   1 -
 src/views/data/Product.vue         |   4 +-
 src/views/setting/Person.vue       | 100 ++++++++++++++--------------
 src/views/user/AddUser.vue         |  23 +++----
 src/views/user/User.vue            |   6 +-
 10 files changed, 159 insertions(+), 167 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75167d6..99505cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1522,8 +1522,8 @@
     },
     "abbrev": {
       "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
-      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "accepts": {
       "version": "1.3.7",
@@ -1685,8 +1685,8 @@
     },
     "are-we-there-yet": {
       "version": "1.1.5",
-      "resolved": "https://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -2003,7 +2003,7 @@
     },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-dynamic-import/download/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
       "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
     },
     "babel-polyfill": {
@@ -5459,8 +5459,8 @@
     },
     "fstream": {
       "version": "1.0.12",
-      "resolved": "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz",
-      "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -5523,8 +5523,8 @@
     },
     "gaze": {
       "version": "1.1.3",
-      "resolved": "https://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz",
-      "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "requires": {
         "globule": "^1.0.0"
       }
@@ -5794,8 +5794,8 @@
     },
     "globule": {
       "version": "1.3.2",
-      "resolved": "https://registry.npm.taobao.org/globule/download/globule-1.3.2.tgz",
-      "integrity": "sha1-2L3Z6eTu+PluJFmZpd7n612FKcQ=",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
+      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
       "requires": {
         "glob": "~7.1.1",
         "lodash": "~4.17.10",
@@ -6938,8 +6938,8 @@
     },
     "in-publish": {
       "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.1.tgz",
-      "integrity": "sha1-lIsaU1yAMFYc6lIvc/ePS+NX4Aw="
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="
     },
     "indent-string": {
       "version": "2.1.0",
@@ -8358,8 +8358,8 @@
     },
     "node-gyp": {
       "version": "3.8.0",
-      "resolved": "https://registry.nlark.com/node-gyp/download/node-gyp-3.8.0.tgz",
-      "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "requires": {
         "fstream": "^1.0.0",
         "glob": "^7.0.3",
@@ -8451,8 +8451,8 @@
     },
     "node-sass": {
       "version": "4.14.1",
-      "resolved": "https://registry.nlark.com/node-sass/download/node-sass-4.14.1.tgz",
-      "integrity": "sha1-mch+wu+3BH7WOPtMnbfzpC4iF7U=",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "requires": {
         "async-foreach": "^0.1.3",
         "chalk": "^1.1.1",
@@ -8506,8 +8506,8 @@
         },
         "lru-cache": {
           "version": "4.1.5",
-          "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz?cache=0&sync_timestamp=1594427582110&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-4.1.5.tgz",
-          "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "requires": {
             "pseudomap": "^1.0.2",
             "yallist": "^2.1.2"
@@ -8585,8 +8585,8 @@
     },
     "npmlog": {
       "version": "4.1.2",
-      "resolved": "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -8889,8 +8889,8 @@
     },
     "osenv": {
       "version": "0.1.5",
-      "resolved": "https://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz?cache=0&sync_timestamp=1589682762332&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fosenv%2Fdownload%2Fosenv-0.1.5.tgz",
-      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -10793,8 +10793,8 @@
     },
     "sass-graph": {
       "version": "2.2.5",
-      "resolved": "https://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.5.tgz",
-      "integrity": "sha1-qYHIdEa4MZ2W3OBnHkh4eb0kwug=",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
+      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
       "requires": {
         "glob": "^7.0.0",
         "lodash": "^4.0.0",
@@ -10804,21 +10804,21 @@
       "dependencies": {
         "emoji-regex": {
           "version": "7.0.3",
-          "resolved": "https://registry.nlark.com/emoji-regex/download/emoji-regex-7.0.3.tgz",
-          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY="
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
         },
         "find-up": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1597169842138&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz",
-          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "requires": {
             "locate-path": "^3.0.0"
           }
         },
         "locate-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
-          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "requires": {
             "p-locate": "^3.0.0",
             "path-exists": "^3.0.0"
@@ -10826,29 +10826,29 @@
         },
         "p-limit": {
           "version": "2.3.0",
-          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1606290276843&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz",
-          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "requires": {
             "p-try": "^2.0.0"
           }
         },
         "p-locate": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
-          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "requires": {
             "p-limit": "^2.0.0"
           }
         },
         "p-try": {
           "version": "2.2.0",
-          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
-          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
         "string-width": {
           "version": "3.1.0",
-          "resolved": "https://registry.nlark.com/string-width/download/string-width-3.1.0.tgz",
-          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
             "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
@@ -10857,8 +10857,8 @@
         },
         "yargs": {
           "version": "13.3.2",
-          "resolved": "https://registry.nlark.com/yargs/download/yargs-13.3.2.tgz?cache=0&sync_timestamp=1620086465147&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs%2Fdownload%2Fyargs-13.3.2.tgz",
-          "integrity": "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "requires": {
             "cliui": "^5.0.0",
             "find-up": "^3.0.0",
@@ -10874,8 +10874,8 @@
         },
         "yargs-parser": {
           "version": "13.1.2",
-          "resolved": "https://registry.nlark.com/yargs-parser/download/yargs-parser-13.1.2.tgz",
-          "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "requires": {
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"
@@ -11614,8 +11614,8 @@
     },
     "stdout-stream": {
       "version": "1.4.1",
-      "resolved": "https://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.1.tgz",
-      "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "requires": {
         "readable-stream": "^2.0.1"
       }
@@ -11853,8 +11853,8 @@
     },
     "tar": {
       "version": "2.2.2",
-      "resolved": "https://registry.nlark.com/tar/download/tar-2.2.2.tgz?cache=0&sync_timestamp=1618847250141&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftar%2Fdownload%2Ftar-2.2.2.tgz",
-      "integrity": "sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "requires": {
         "block-stream": "*",
         "fstream": "^1.0.12",
@@ -12108,8 +12108,8 @@
     },
     "true-case-path": {
       "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz",
-      "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "requires": {
         "glob": "^7.1.2"
       }
@@ -13143,8 +13143,8 @@
     },
     "wide-align": {
       "version": "1.1.3",
-      "resolved": "https://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz",
-      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
diff --git a/package.json b/package.json
index a13c960..442253c 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
     "@vue/cli-plugin-babel": "^3.9.0",
     "@vue/cli-service": "^3.9.0",
     "element-theme-chalk": "^2.13.0",
-    "node-sass": "^4.14.1",
     "sass-loader": "^8.0.0",
     "vue-template-compiler": "^2.6.10"
   }
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 93e4191..af3ddae 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -6,8 +6,8 @@
         <div class="header-right">
             <div class="header-user-con">
                 <div class="user" @click="toPerson">
-                    <el-avatar :size="40" :src="circleUrl"></el-avatar>
-                    <span class="user-avator">{{username}}</span>
+                    <el-avatar :size="40" :src="avatar"></el-avatar>
+                    <span class="user-avator">{{userName}}</span>
                 </div>
                 <el-divider class="ml20" direction="vertical"></el-divider>
                 <el-button type="text" class="ml20" @click="loginout">退出</el-button>
@@ -19,20 +19,21 @@
 export default {
     data() {
         return {
-            collapse: false,
-            fullscreen: false,
-            name: 'huoran',
-            message: 2,
-            circleUrl: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
+            avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
+            userName: ''
         };
     },
-    computed: {
-        username() {
-            let username = localStorage.getItem('ms_username');
-            return username ? username : this.name;
-        }
+    mounted(){
+        this.userName || this.getUserInfo()
     },
     methods: {
+        getUserInfo(){
+            this.$get(this.api.queryUserInfoDetails).then(res => {
+                let userInfo = res.result.hrUserInfo
+                this.avatar = userInfo.userAvatars
+                this.userName = userInfo.userName
+            }).catch(err => {})
+        },
         toPerson(){
             this.$router.push('/person')
         },
diff --git a/src/utils/api.js b/src/utils/api.js
index 97a38ba..b550c60 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -47,20 +47,20 @@ export default {
   queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`,
 
   // 用户管理
-  delUserAccount: `${host3}/users/userAccount/delUserAccount`,
+  delUserAccounts: `${host3}/users/userAccount/delUserAccounts`,
   queryUserInfoDetails: `${host3}/users/userAccount/queryUserInfoDetails`,
   queryUserInfoList: `${host3}/users/userAccount/queryUserInfoList`,
   resetPwd: `${host3}/users/userAccount/resetPwd`,
   selectAccountDetail: `${host3}/users/userAccount/selectAccountDetail`,
   selectUserSysBind: `${host3}/users/userAccount/selectUserSysBind`,
   updatePersonCenter: `${host3}/users/userAccount/updatePersonCenter`,
-  updateUserAvatars: `${host3}/users/userAccount/updateUserAvatars`,
+  updateUserAvatars: `${host2}/users/userAccount/updateUserAvatars`,
   userInfo: `${host3}/users/userAccount/userInfo`,
-  bindPhone: `${host3}/users/userAccount/bindPhone`,
-  sendPhoneCode: `${host3}/users/userAccount/sendPhoneCode`,
-  findPasswordByPhone: `${host3}/users/userAccount/findPasswordByPhone`,
+  bindPhoneOrEmail: `${host3}/users/userAccount/bindPhoneOrEmail`,
+  sendPhoneOrEmailCode: `${host3}/users/userAccount/sendPhoneOrEmailCode`,
   updateAccountEnable: `${host3}/users/userAccount/updateAccountEnable`,
   updateAccountAllEnable: `${host3}/users/userAccount/updateAccountAllEnable`,
+  examinePassword: `${host3}/users/userAccount/examinePassword`,
   
   queryOrder: `${host}/liuwanr/order/queryOrder`, //查询订单
   queryOrderDetails: `${host}/liuwanr/order/queryOrderDetails`, //查询订单详情
@@ -97,9 +97,9 @@ export default {
   queryProvince: `${host3}/nakadai/province/queryProvince`, //查询省份
   queryCity: `${host3}/nakadai/city/queryCity`, //查询城市
 
-  queryCourseDiscipline: `${host}/liuwanr/course/queryCourseDiscipline`, //查询课程学科
-  queryCourseProfessionalClass: `${host}/liuwanr/course/queryCourseProfessionalClass`, //查询专业类
-  queryCourseProfessional: `${host}/liuwanr/course/queryCourseProfessional`, //查询专业
+  queryCourseDiscipline: `${host3}/nakadai/discipline/queryDiscipline`, //查询课程学科
+  queryCourseProfessionalClass: `${host3}/nakadai/professionalClass/queryProfessionalClass`, //查询专业类
+  queryCourseProfessional: `${host3}/nakadai/professional/queryProfessional`, //查询专业
   queryAppConfig: `${host}/liuwanr/course/queryAppConfig`, //查询应用配置
   queryTrainingConfig: `${host}/liuwanr/course/queryConfig`, //查询实训配置
   deleteTrainingConfig: `${host}/liuwanr/course/deleteTrainingConfig`, //删除实训配置
@@ -114,23 +114,23 @@ export default {
   downloadFiles: `${host}/liuwanr/aliyun/downloadFiles`, //下载文件
 
   // 数据管理
-  getIdQueryTable:`${host}/data/table/getIdQueryTable`,
-  getTableByClassification:`${host}/data/table/getTableByClassification`,
-  getTableByCondition:`${host}/data/table/getTableByCondition`,
-  originalList:`${host}/data/table/originalList`,
-  originalListById:`${host}/data/table/originalListById`,
-  saveCategory:`${host}/data/table/saveCategory`,
-  saveTable:`${host}/data/table/saveTable`,
-  updateCategory:`${host}/data/table/updateCategory`,
-  deleteCategory:`${host}/data/table/deleteCategory`,
-  deleteTable:`${host}/data/table/deleteTable`,
-  previewData:`${host}/data/preview`,
+  getIdQueryTable:`${host1}/data/table/getIdQueryTable`,
+  getTableByClassification:`${host1}/data/table/getTableByClassification`,
+  getTableByCondition:`${host1}/data/table/getTableByCondition`,
+  originalList:`${host1}/data/table/originalList`,
+  originalListById:`${host1}/data/table/originalListById`,
+  saveCategory:`${host1}/data/table/saveCategory`,
+  saveTable:`${host1}/data/table/saveTable`,
+  updateCategory:`${host1}/data/table/updateCategory`,
+  deleteCategory:`${host1}/data/table/deleteCategory`,
+  deleteTable:`${host1}/data/table/deleteTable`,
+  previewData:`${host1}/data/preview`,
 
   // 产品管理
-  deleteProduct:`${host}/data/product/delete`,
-  findById:`${host}/data/product/findById`,
-  listByEntity:`${host}/data/product/listByEntity`,
-  saveProduct:`${host}/data/product/save`,
-  updateProduct:`${host}/data/product/update`,
-  saveRecord:`${host}/data/dataRecord/saveRecord`,
+  deleteProduct:`${host1}/data/product/delete`,
+  findById:`${host1}/data/product/findById`,
+  listByEntity:`${host1}/data/product/listByEntity`,
+  saveProduct:`${host1}/data/product/save`,
+  updateProduct:`${host1}/data/product/update`,
+  saveRecord:`${host1}/data/dataRecord/saveRecord`,
 }
\ No newline at end of file
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index ecab81f..9b0b776 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -7,9 +7,9 @@
                         <div class="per_title" v-preventReClick @click="goback()">
                             <i class="el-icon-arrow-left"></i>
                             <span class="per_back">返回</span>
-                            <span class="per_school" v-text="customerId ? '编辑客户信息' : '新增客户信息'"></span>
+                            <span class="per_school" v-text="isDetail ? '查看客户信息' : (customerId ? '编辑客户信息' : '新增客户信息')"></span>
                         </div>
-                        <el-button type="primary" size="small" round class="mag" v-preventReClick @click="saveAdd('form')">确定</el-button>
+                        <el-button v-if="!isDetail" type="primary" size="small" round class="mag" v-preventReClick @click="saveAdd('form')">确定</el-button>
                     </div>              
                 </el-card>
 
@@ -171,15 +171,15 @@
                         <el-table :data="contractInformations" class="table" stripe header-align="center">
                             <el-table-column type="index" width="100" label="序号" align="center">
                             </el-table-column>
-                            <el-table-column prop="contractInformationNumber" label="合同编号" align="center">
+                            <el-table-column prop="contractNumber" label="合同编号" align="center">
                             </el-table-column>
-                            <el-table-column prop="contractInformationName" label="合同名称" align="center">
+                            <el-table-column prop="contractName" label="合同名称" align="center">
                             </el-table-column>
-                            <el-table-column prop="contractInformationName" label="合同期限" align="center">
+                            <el-table-column prop="endTime" label="合同期限" align="center">
                             </el-table-column>
-                            <el-table-column prop="contractInformationLink" label="产品内容" align="center">
+                            <el-table-column prop="dataOrCourseName" label="产品内容" align="center">
                             </el-table-column>
-                            <el-table-column prop="contractInformationSum" label="合同金额" align="center">
+                            <el-table-column prop="contractMoney" label="合同金额" align="center">
                             </el-table-column>
                             <el-table-column label="操作" align="center">
                                 <template>
diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index 8dc3113..d570805 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -228,7 +228,6 @@ export default {
         preview(row){
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
                 this.$post(this.api.saveRecord,{
-                    platformUserId: 4,
                     tableId: row.id,
                     type: 2,
                     schoolId: this.schoolId,
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index e8055dd..bfad504 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -145,7 +145,6 @@ export default {
     data() {
         return {
             schoolId: 1001,
-            userId: this.$store.state.userLoginId,
             userName: this.$store.state.userName,
             keyword: '',
             searchTimer: null,
@@ -171,6 +170,7 @@ export default {
             totals: 1,
             productVisible: false,
             id: '',
+            userId: '',
             productName: '',
             market: '',
             typeList: [],
@@ -320,6 +320,7 @@ export default {
         edit(row){
             this.getType()
             this.id = row.id
+            this.userId = row.userId
             this.getDetail()
         },
         switchOff(val,row,index) {
@@ -483,7 +484,6 @@ export default {
         previewConfig(row){
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
                 this.$post(this.api.saveRecord,{
-                    platformUserId: 4,
                     tableId: row.id,
                     type: 2,
                     schoolId: this.schoolId,
diff --git a/src/views/setting/Person.vue b/src/views/setting/Person.vue
index 2df6857..4e6c898 100644
--- a/src/views/setting/Person.vue
+++ b/src/views/setting/Person.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="wrap">
         <div class="header">
-            <el-avatar :size="80" :src="this.$store.state.avatar" class="Headtop"></el-avatar>
+            <el-avatar :size="80" :src="this.form.avatar" class="Headtop"></el-avatar>
             <div style="color:#9278FF;font-size:14px;font-family:MicrosoftYaHei;margin-top:5px;">
                 <el-upload
                     class="upload-demo"
+                    :headers="{token}"
                     :action="this.api.updateUserAvatars"
-                    :data="{userId:this.userId}"
                     name="file"
                     :limit="1"
                     :on-success="getRes"
@@ -381,7 +381,7 @@
 export default {
     data() {
         return {
-            userId: this.$store.state.userLoginId,
+            token: sessionStorage.getItem('token'),
             form: {
                 name:'',
                 workNumber:'',
@@ -482,7 +482,6 @@ export default {
                 disciplineName: '', //专业学科名称
                 professionalId: '', //专业
                 professionalName: '', //专业名称
-                userId: this.userId
             },
             email: '',
             emailBtnText: '发送验证码',
@@ -546,7 +545,7 @@ export default {
         getSchoolData(){
             this.$get(this.api.querySchoolData,{schoolName: '',provinceId: '',cityId: ''}).then(res => {
                 this.schoolList = res.list
-            }).catch(res => {});
+            }).catch(res => {})
         },
         async accountChange(){
             if(this.originAccount != this.form.account){
@@ -569,7 +568,7 @@ export default {
             this.$store.commit('userPhoto',{avatar:res.message})
         },
         getdata() {
-            this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => {
+            this.$get(this.api.queryUserInfoDetails).then(res => {
                 let userInfo = res.result.hrUserInfo
                 let schoolId = userInfo.schoolId
                 this.form = Object.assign(userInfo,res.result.userAccountList[0])
@@ -595,27 +594,19 @@ export default {
                             this.$set(e, 'schoolName', e.schoolName ? e.schoolName : '');
 
                             if(e.disciplineId){
-                                this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: e.disciplineId }).then(res => {
-                                    this.$set(e, 'ProfessionalClassList', res.message);
+                                this.$post(this.api.queryCourseProfessionalClass,[e.disciplineId]).then(res => {
+                                    this.$set(e, 'ProfessionalClassList', res.result);
                                 }).catch(res => {});
                             }else{
                                 this.$set(e, 'ProfessionalClassList', []);
                             }
                             if(e.professionalClassId){
                                 this.$get(this.api.queryCourseProfessional,{ professionalClassId: e.professionalClassId }).then(res => {
-                                    this.$set(e, 'ProfessionalList', res.message);
+                                    this.$set(e, 'ProfessionalList', res.result);
                                 }).catch(res => {});
                             }else{
                                 this.$set(e, 'ProfessionalList', []);
                             }
-                            // if(e.provinceId){
-                            //     this.$get(this.api.queryCity,{provinceId: e.provinceId}).then(res => {
-                            //         this.$set(e, 'cityList', res.message);
-                            //     }).catch(res => {});
-                            // }else{
-                            //     this.$set(e, 'cityList', []);
-                            // }
-                            console.log(11,window.scrollTo)
                         })
                     }else{
                         this.concatArch(1)
@@ -638,7 +629,6 @@ export default {
                 ProfessionalList: [],
                 professionalId: '',
                 professionalName: '',
-                userId: this.userId,
                 personalFileId: ''
             })
             // if(!isLoadData){
@@ -677,11 +667,13 @@ export default {
             if(this.passwordForm.password === this.passwordForm.newPassword) return this.$message.warning('原密码跟新密码不能一致')
 
             let data = this.passwordForm
-            data.userid = this.userId
+            data.accountId = this.form.userId
             this.$post(this.api.examinePassword,data).then(res => {
-                if(res.errmessage == 'success'){
+                if(res.status == 200){
                     this.$message.success('更换成功')
                     this.passwordVisible = false
+                }else{
+                    this.$message.error(res.message)
                 }
             }).catch(err => {})
         },
@@ -701,8 +693,8 @@ export default {
         },
         // 获取学科类别
         getSubject(){
-            this.$get(this.api.queryCourseDiscipline).then(res => {
-                this.subjectList = res.message
+            this.$post(this.api.queryCourseDiscipline).then(res => {
+                this.subjectList = res.result
             }).catch(res => {})
         },
         // 清除学科类别
@@ -743,10 +735,10 @@ export default {
                 obj = this.subjectList.find(r =>{
                     return r.disciplineId === item
                 });
-                this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: item }).then(res => {
+                this.$post(this.api.queryCourseProfessionalClass,[item]).then(res => {
                     this.archivesList.map(e =>{
                         if(e.disciplineId == item){
-                            e.ProfessionalClassList = res.message
+                            e.ProfessionalClassList = res.result
                             e.disciplineName = obj.disciplineName
                         }
                     })
@@ -754,8 +746,8 @@ export default {
             }
         },
         getProfessionalClassData(value){
-            this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: value }).then(res => {
-                this.ProfessionalClassList = res.message
+            this.$post(this.api.queryCourseProfessionalClass,[value]).then(res => {
+                this.ProfessionalClassList = res.result
             }).catch(res => {})
         },
         // 清除专业类
@@ -794,7 +786,7 @@ export default {
                             obj = e.ProfessionalClassList.find(r =>{
                                 return r.professionalClassId === item
                             })
-                            e.ProfessionalList = res.message
+                            e.ProfessionalList = res.result
                             e.professionalClassName = obj.professionalClassName
                         }
                     })
@@ -803,7 +795,7 @@ export default {
         },
         getProfessionalData(value){
             this.$get(this.api.queryCourseProfessional,{professionalClassId: value}).then(res => {
-                this.ProfessionalList = res.message
+                this.ProfessionalList = res.result
             }).catch(res => {})
         },
         // 获取专业名称
@@ -831,18 +823,17 @@ export default {
         },
         save() {
             let isEmpty = false
-            this.archivesList.forEach((n,k) => {
-                if(!n.personalCareerId) isEmpty = true
-                n.userId = this.userId
-            })
-            if(isEmpty) return this.$message.warning('请选择职业')
+            // this.archivesList.forEach((n,k) => {
+            //     if(!n.personalCareerId) isEmpty = true
+            //     n.userId = this.form.userId
+            // })
+            // if(isEmpty) return this.$message.warning('请选择职业')
             if(this.accountReapeat) return this.$message.warning('该账号已存在')
             if(this.form.idNumber && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/.test(this.form.idNumber)) return this.$message.warning('请输入正确的证件号码')
-            // this.form.userId = this.userId
             let form = this.form
             let personalFileList = []
             this.archivesList.forEach((n,k) => {
-                personalFileList.push({
+                n.personalCareerId && personalFileList.push({
                     disciplineId: n.disciplineId,
                     disciplineName: n.disciplineName,
                     personalCareerId: n.personalCareerId,
@@ -855,11 +846,11 @@ export default {
                     provinceName: n.provinceName,
                     schoolId: n.schoolId,
                     schoolName: n.schoolName,
-                    userId: this.userId
+                    userId: form.userId
                 })
             })
             let data = {
-                userId: this.userId,
+                userId: form.userId,
                 userAccountList: [{
                     id: form.accountId,
                     account: form.account,
@@ -874,8 +865,9 @@ export default {
                     idNumber: form.idNumber,
                     schoolId: form.schoolId,
                     sex: form.sex,
-                    userId: this.userId,
+                    userId: form.userId,
                     userName: form.userName,
+                    wechatId: form.wechatId
                 },
                 personalFileList,
             }
@@ -928,14 +920,16 @@ export default {
             if(!this.email) return this.$message.warning('请输入邮箱')
             if(!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return this.$message.warning('请输入正确的邮箱')
             let data = {
-                userId: this.userId,
+                userId: this.form.userId,
                 email: this.email,
                 types: 1
             }
-            this.$post(this.api.sendEmailCode,data).then(res => {
-                if(res.errmessage == 'success'){
+            this.$post(this.api.sendPhoneOrEmailCode,data).then(res => {
+                if(res.message.opener){
                     this.emailCountdown()
-                    this.emailOpener = res.data
+                    this.emailOpener = res.message.opener
+                }else{
+                    this.$message.error(res.message)
                 }
             }).catch(res => {});
         },
@@ -944,14 +938,14 @@ export default {
             if(!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return this.$message.warning('请输入正确的邮箱')
             if(!this.emailCode) return this.$message.warning('请输入验证码')
             let data = {
-                userId: this.userId,
+                userId: this.form.userId,
                 email: this.email,
                 types: 1,
                 code: this.emailCode,
                 opener: this.emailOpener
             }
-            this.$put(this.api.bingEmail,data).then(res => {
-                if(res.errmessage == 'success'){
+            this.$post(this.api.bindPhoneOrEmail,data).then(res => {
+                if(res.status == 200){
                     this.$message.success('绑定成功')
                     this.form.email = this.email
                     this.emailVisible = false
@@ -966,14 +960,16 @@ export default {
         sendPhoneCode(){
             if(!this.phone) return this.$message.warning('请输入手机号')
             if(!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
-            this.$post(this.api.sendPhoneCode,{
-                userId: this.userId,
+            this.$post(this.api.sendPhoneOrEmailCode,{
+                userId: this.form.userId,
                 phone: this.phone,
                 types: 2
             }).then(res => {
-                if(res.status == 200){
+                if(res.message.opener){
                     this.phoneCountdown()
-                    this.phoneOpener = res.data
+                    this.phoneOpener = res.message.opener
+                }else{
+                    this.$message.error(res.message)
                 }
             }).catch(res => {})
         },
@@ -982,14 +978,14 @@ export default {
             if(!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
             if(!this.phoneCode) return this.$message.warning('请输入验证码')
             let data = {
-                userId: this.userId,
+                userId: this.form.userId,
                 phone: this.phone,
                 types: 2,
                 code: this.phoneCode,
                 opener: this.phoneOpener
             }
-            this.$put(this.api.bindPhone,data).then(res => {
-                if(res.errmessage == 'success'){
+            this.$post(this.api.bindPhoneOrEmail,data).then(res => {
+                if(res.status == 200){
                     this.$message.success('绑定成功')
                     this.form.phone = this.phone
                     this.phoneVisible = false
diff --git a/src/views/user/AddUser.vue b/src/views/user/AddUser.vue
index fa74782..9439100 100644
--- a/src/views/user/AddUser.vue
+++ b/src/views/user/AddUser.vue
@@ -335,7 +335,7 @@
                                     <p class="school-name">{{index}}</p>
                                     <div class="card" :class="{isie: isIE()}">
                                         <div class="port" v-for="(item1,index1) in item" :key="index1">
-                                            <p class="port-name">{{typeList.find(n => n.id == item1.type).label}}</p>
+                                            <p class="port-name">{{typeList.find(n => n.id == item1.type) ? typeList.find(n => n.id == item1.type).label : ''}}</p>
                                             <el-card shadow="hover">
                                                 <ul class="fields">
                                                     <div class="line">
@@ -607,13 +607,13 @@ export default {
                     personalFileList.map(e =>{
                         this.$set(e, 'subjectList', this.subjectList);
                         if(e.disciplineId){
-                            this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: e.disciplineId }).then(res => {
-                                this.$set(e, 'ProfessionalClassList', res.message);
+                            this.$post(this.api.queryCourseProfessionalClass,[e.disciplineId]).then(res => {
+                                this.$set(e, 'ProfessionalClassList', res.result);
                             }).catch(res => {});
                         }
                         if(e.professionalClassId){
                             this.$get(this.api.queryCourseProfessional,{ professionalClassId: e.professionalClassId }).then(res => {
-                                this.$set(e, 'ProfessionalList', res.message);
+                                this.$set(e, 'ProfessionalList', res.result);
                             }).catch(res => {});
                         }
                     })
@@ -719,10 +719,10 @@ export default {
                 obj = this.subjectList.find(r =>{
                     return r.disciplineId === item;
                 });
-                this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: item }).then(res => {
+                this.$get(this.api.queryCourseProfessionalClass,[item]).then(res => {
                     this.archivesList.map(e =>{
                         if(e.disciplineId == item){
-                            e.ProfessionalClassList = res.message
+                            e.ProfessionalClassList = res.result
                             e.disciplineName = obj.disciplineName
                         }
                     })
@@ -730,8 +730,8 @@ export default {
             }
         },
         getProfessionalClassData(value){
-            this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: value }).then(res => {
-                this.ProfessionalClassList = res.message
+            this.$get(this.api.queryCourseProfessionalClass,[value]).then(res => {
+                this.ProfessionalClassList = res.result
             }).catch(res => {});
         },
         // 清除专业类
@@ -770,7 +770,7 @@ export default {
                             obj = e.ProfessionalClassList.find(r =>{
                                 return r.professionalClassId === item;
                             });
-                            e.ProfessionalList = res.message
+                            e.ProfessionalList = res.result
                             e.professionalClassName = obj.professionalClassName
                         }
                     })
@@ -779,7 +779,7 @@ export default {
         },
         getProfessionalData(value){
             this.$get(this.api.queryCourseProfessional,{professionalClassId: value}).then(res => {
-                this.ProfessionalList = res.message
+                this.ProfessionalList = res.result
             }).catch(res => {});
         },
         // 获取专业名称
@@ -822,10 +822,11 @@ export default {
                 let list = res.result.map
                 for(let i in list){
                     for(let n in list[i]){
-                        console.log(11,list[i][n])
                         list[i] = list[i][n]
                     }
                 }
+                        console.log(333,list)
+
                 this.chooseList = list
                 console.log(11,list)
             }).catch(res => {})
diff --git a/src/views/user/User.vue b/src/views/user/User.vue
index fa5653a..7aae50a 100644
--- a/src/views/user/User.vue
+++ b/src/views/user/User.vue
@@ -234,7 +234,6 @@ export default {
                 endTime: this.form.endTime,
                 roleId: this.form.accountRole,
                 searchContent: this.form.keyword,
-                platformId: this.platformId,
                 page: this.page,
                 size: this.pageSize
             }
@@ -310,10 +309,7 @@ export default {
             this.$confirm('确定要删除吗？', '提示', {
                 type: 'warning'
             }).then(() => {
-                this.$get(this.api.delUserAccount,{
-                    userId: row.userId,
-                    isdel: 1
-                }).then(res => {
+                this.$post(this.api.delUserAccounts,[row.userId]).then(res => {
                     this.$message.success('删除成功')
                     this.getData()
                 }).catch(res => {})