解决冲突

package.json

@@ -14,6 +14,7 @@
     "babel-plugin-lodash": "^3.3.4",
     "big.js": "^6.2.1",
     "core-js": "^3.6.5",
+    "gm-crypt": "^0.0.2",
     "lodash": "^4.17.21",
     "lodash-webpack-plugin": "^0.11.6",
     "moment": "^2.29.1",

src/utils/crypt.js

+const SM4 = require("gm-crypt").sm4;
+export default function(params) {
+  if (typeof params == "undefined") {
+    params = null;
+  }
+  // 动态生成key
+  const nowDate = new Date();
+  const m = dateZero(nowDate.getMonth() + 1);
+  const d = dateZero(nowDate.getDate());
+  const key = `Nanyan@s${nowDate.getFullYear()}${m}${d}`;
+  let sm4Config = {
+    //配置sm4参数
+    key, // key
+    mode: "ecb", // 加密的方式有两种，ecb和cbc两种，cbc的话下面还要加一个iv的参数，ecb不用
+    cipherType: "text"
+  };
+  let sm4 = new SM4(sm4Config);
+  let encryptData = sm4.encrypt(params);
+
+  return encryptData.trim();
+}
+
+function dateZero(num) {
+  return num < 10 ? "0" + num : num;
+}

src/views/author/forget.vue

@@ -70,6 +70,7 @@
 </template>
 
 <script>
+import encrypt from '@/utils/crypt'
 export default {
   data() {
     return {
@@ -123,7 +124,7 @@ export default {
           return false;
         }
         const { userName, verificationCode, newPwd } = this.form;
-        this._reset({ userName, verificationCode, newPwd });
+        this._reset({ userName, verificationCode, newPwd:encrypt(newPwd) });
       });
     },
     //校验用户邮箱

src/views/author/login.vue

@@ -45,6 +45,7 @@
 <script>
 import { title } from "@/settings";
 import { downloadFile } from '@/utils/index'
+import encrypt from '@/utils/crypt'
 export default {
   data() {
     return {
@@ -81,7 +82,7 @@ export default {
       });
     },
     _login() {
-      this.$apis.login(this.form).then((res) => {
+      this.$apis.login({...this.form,passWord:encrypt(this.form.passWord)}).then((res) => {
         if (res.returnCode === "0000") {
           this.$store.commit("common/setUserInfo", res.content);
           const path = this.$route.query && this.$route.query.redirect || "/home";

src/views/charge-query/lpjManageDetail.vue

@@ -292,7 +292,7 @@ export default {
             { title: "减免金额", dataIndex: "reduceAmount", width: 100, align: 'center' },
             { title: "客户自付", dataIndex: "selfpaidAmount", width: 100, align: 'center' },
             { title: "理赔金额", dataIndex: "actualAmount", width: 100, align: 'center' },
-            { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
+            { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center'},
         ];
         if(this.sendBatchNo && ! this.isEditNewBill && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
             return base.concat([