resolve last_build_commit conflict

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1586",
+  "version": "1.0.1587",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1586",
+      "version": "1.0.1587",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

cfc-web/src/views/admin/ProductEdit.vue

@@ -1164,9 +1164,12 @@ async loadGiftRule(productId) {
           }
         } catch (e) {
           this.$message.error('操作失败')
+} else {
+            this.$message.error('操作失败');
         } finally {
-          this.saving = false
+            this.saving = false;
         }
+    }
       })
     }
   }