Merge remote-tracking branch 'origin/master'

src/views/engine/engine/list.vue

@@ -383,13 +383,26 @@ export default {
 
       this.versions.status = 1
 
+      console.log(this.versions)
+
+      // generate(this.versions).then(res =>{
+      //
+      //   this.versions.ruleContent=res.ruleContent;
+      //
+      //   console.log(res.ruleContent)
+      //
+      //   this.$message.success(res.msg || "成功");
+      //
+      // })
+
       add(this.versions).then(res => {
 
-        this.$modal.msgSuccess(res.msg || "新增成功")
+
+        this.$message.success(res.msg || "新增成功")
 
       })
 
-      this.findById();
+      this.List();
 
     },
 
@@ -401,7 +414,7 @@ export default {
 
       })
 
-      this.findById();
+      this.List();
 
     },
 
@@ -439,7 +452,8 @@ export default {
 
     del(id) {
 
-      if (confirm("你确定删除吗?")) {
+      if (confirm("你确定" +
+        "删除吗?")) {
 
         dels(id).then(res => {
 

src/views/money/buy/index.vue

@@ -144,7 +144,7 @@ export default {
         title: {
           left: "3%",
           top: "5%",
-          text: "各个产品消费的总金额", // 自定义
+          text: "消费趋势", // 自定义
         },
 
         tooltip: {