更新

package-lock.json

@@ -2283,6 +2283,15 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "bar": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npm.taobao.org/bar/download/bar-0.1.2.tgz",
+      "integrity": "sha1-7DbYDF/qERH+HjLJ2zimEFMiUVU=",
+      "requires": {
+        "optimist": "~ 0.2.4",
+        "watch": "~ 0.3.2"
+      }
+    },
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npm.taobao.org/base/download/base-0.11.2.tgz",
@@ -4249,6 +4258,14 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "echarts": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.7.0.tgz",
+      "integrity": "sha1-Wzh1pML5HjkpQl+rq56s5+QJiz8=",
+      "requires": {
+        "zrender": "4.3.0"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -7790,9 +7807,9 @@
       }
     },
     "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.24.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.24.0.tgz",
-      "integrity": "sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s="
+      "version": "2.25.3",
+      "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.25.3.tgz?cache=0&sync_timestamp=1588605303253&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.25.3.tgz",
+      "integrity": "sha1-JS/0ExnPQeR3YaGojKsw7f6YCMA="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -8226,6 +8243,14 @@
         "is-wsl": "^1.1.0"
       }
     },
+    "optimist": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npm.taobao.org/optimist/download/optimist-0.2.8.tgz",
+      "integrity": "sha1-6YGrfiaLRXlIWTtVZ0wJmoFcrDE=",
+      "requires": {
+        "wordwrap": ">=0.0.1 <0.1.0"
+      }
+    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz",
@@ -11552,6 +11577,11 @@
       "resolved": "https://registry.npm.taobao.org/wangeditor/download/wangeditor-3.1.1.tgz",
       "integrity": "sha1-+9PB1JdpI8nt67hbKdMLNVEq0Dk="
     },
+    "watch": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npm.taobao.org/watch/download/watch-0.3.3.tgz",
+      "integrity": "sha1-Kqd2cW7UY0ZNuqLC5PnGrKHi+jw="
+    },
     "watchpack": {
       "version": "1.6.1",
       "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.1.tgz",
@@ -12020,6 +12050,11 @@
       "integrity": "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=",
       "dev": true
     },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npm.taobao.org/worker-farm/download/worker-farm-1.7.0.tgz",
@@ -12256,6 +12291,11 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.0.tgz",
+      "integrity": "sha1-nwVhIbILuuREFNKHv2oRn/cEJmE="
     }
   }
 }

package.json

@@ -10,12 +10,13 @@
   "dependencies": {
     "@stomp/stompjs": "^5.4.4",
     "axios": "^0.19.2",
+    "bar": "^0.1.2",
     "core-js": "^3.6.4",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
     "jsonwebtoken": "^8.5.1",
     "loadsh": "0.0.4",
-    "moment": "^2.24.0",
+    "moment": "^2.25.3",
     "naf-core": "^0.1.2",
     "stomp": "^0.1.1",
     "vue": "^2.6.11",

src/layout/enterprise/xiugai.vue

@@ -6,8 +6,11 @@
           <el-col :span="24" class="leftTop"> <span>|</span> <span>修改密码</span></el-col>
           <el-col :span="24" class="context">
             <el-form ref="form" :model="form" label-width="60px">
+              <el-form-item label="旧密码">
+                <el-input v-model="form.oldpasswd" placeholder="请输入新密码" show-password></el-input>
+              </el-form-item>
               <el-form-item label="新密码">
-                <el-input v-model="form.password" placeholder="请输入新密码" show-password></el-input>
+                <el-input v-model="form.newpasswd" placeholder="请输入新密码" show-password></el-input>
               </el-form-item>
               <el-col :span="24" class="loginSubmit"><el-button type="primary" @click="registerSubmit">修改</el-button></el-col>
             </el-form>
@@ -30,8 +33,6 @@ export default {
   computed: {},
   methods: {
     registerSubmit() {
-      console.log(this.form);
-
       this.$emit('submitDates', { data: this.form });
     },
   },

src/store/index.js

@@ -18,6 +18,7 @@ import markettype from '@common/store/market/markettype';
 import enterpriseproject from '@common/store/market/enterpriseproject';
 import newmarketproduct from '@common/store/market/newmarketproduct';
 import place from '@common/store/place/place';
+import password from '@common/store/market/password';
 
 Vue.use(Vuex);
 
@@ -42,5 +43,6 @@ export default new Vuex.Store({
     enterpriseproject,
     newmarketproduct,
     place,
+    password,
   },
 });

src/views/enterprise/xiugai.vue

@@ -8,7 +8,7 @@
 import xiugaiDetail from '@/components/enterprise/xiugai.vue';
 import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
-const { mapActions: mapMarket } = createNamespacedHelpers('market');
+const { mapActions: password } = createNamespacedHelpers('password');
 const { mapActions: login } = createNamespacedHelpers('login');
 export default {
   name: 'adviserList',
@@ -36,9 +36,8 @@ export default {
   },
   methods: {
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
-    ...mapMarket({ userFetch: 'fetch', userCreate: 'create', userUpdate: 'update' }),
-    async onsaveClick({ id }) {
-      console.log(id);
+    ...password({ userFetch: 'fetch', userCreate: 'create', userUpdate: 'update' }),
+    onsaveClick({ id }) {
       if (id === '基本信息') {
         this.$router.push({ path: '/enterprise/enterprisejb' });
       } else if (id === '消息管理') {
@@ -67,9 +66,10 @@ export default {
     },
     async submit({ data }) {
       data.id = this.user.uid;
+      console.log(data);
+      // console.log(data);
       let res = await this.userUpdate(data);
-      let msg = `修改成功`;
-      this.$checkRes(res, msg);
+      console.log(res);
     },
   },
 };