Merge branch 'bencao' of ssh://gogs.hanyiyun.com:2222/xmnk/party into bencao

src/views/kaohe/rewardList.vue

@@ -3,7 +3,7 @@
  * @Author: 旭颖
  * @Date: 2023-03-22 10:15:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-25 16:28:49
+ * @LastEditTime: 2023-03-25 16:36:15
 -->
 <template>
   <div class="index-home" v-loading.fullscreen.lock="loadingFull">
@@ -221,7 +221,7 @@ export default {
         });
       } else {
         this.$router.push({
-          path: "/kaohe/checkList",
+          path: "/kaohe/index",
         });
       }
     },

src/views/setting/api/index.js

@@ -12,16 +12,16 @@ export function getList(params) {
 
 export function doAdd(data) {
   return request({
-    url: '/setting',
-    method: 'post',
+    url: "/setting",
+    method: "post",
     data,
-  })
+  });
 }
 
 export function doEdit(data) {
   return request({
-    url: '/setting/' + data.id,
-    method: 'put',
+    url: "/setting",
+    method: "put",
     data,
-  })
-}
+  });
+}

src/views/setting/components/ConfigureManage.vue

@@ -53,7 +53,7 @@
       <div class="star">
         <span class="xing">*</span>
         <el-form-item v-if="form.type == 2" label="配置内容:" prop="value">
-          <tinymce v-model="form.value" :height="400" width="95%" />
+          <tinymce v-model="form.value" :height="400" />
         </el-form-item>
         <el-form-item v-if="form.type == 0" label="配置内容:" prop="value">
           <el-input v-model="form.value" />
@@ -121,7 +121,7 @@ export default {
       form: {
         status: 1,
         sort: 0,
-        type: 2,
+        type: 0,
         parent_id: 0,
       },
       type_list: [
@@ -224,12 +224,7 @@ export default {
       this.$refs["form"].validate(async (valid) => {
         if (valid) {
           const { message } = await doEdit(this.form);
-          this.$baseMessage(
-            message,
-            "success",
-            false,
-            "vab-hey-message-success"
-          );
+          this.$message.success(message);
           this.$emit("fetch-data");
           this.close();
         }
@@ -244,16 +239,10 @@ export default {
         },
       ];
       const { data } = await getList();
-      console.log(data, "编辑hhhhhhhh");
       this.treeData = arr.concat(data);
-      console.log(arr, "arr");
-
-      console.log(this.treeData, "this.treeData");
     },
     handleNodeClick(node) {
-      console.log(node, "99999");
       this.$refs.selectblur.blur();
-
       this.form.parent_name = node.name;
       this.form.parent_id = node.id;
       this.$forceUpdate();