xieren 4 年 前
コミット
a2d4ba4b36

+ 5 - 2
src/components/account/Create.vue

@@ -1,4 +1,4 @@
-<style lang="less">
+P<style lang="less">
 .input-with-select .el-input-group__append,
 .input-with-select .el-input-group__prepend {
   background-color: #fff;
@@ -242,7 +242,10 @@ export default {
         avatar: ""
       },
       prefixData: [],
-      sexData: [{ name: "男", value: 1 }, { name: "女", value: 2 }],
+      sexData: [
+        { name: "男", value: 1 },
+        { name: "女", value: 2 }
+      ],
       uploadData: {
         project: "hooli",
         contentType: "oms/avatar"

+ 4 - 1
src/components/account/Edit.vue

@@ -269,7 +269,10 @@ export default {
         roleId: null
       },
       prefixData: [],
-      sexData: [{ name: "男", value: "1" }, { name: "女", value: "2" }],
+      sexData: [
+        { name: "男", value: "1" },
+        { name: "女", value: "2" }
+      ],
       uploadData: {
         project: "hooli",
         contentType: "oms/avatar"

+ 2 - 2
src/components/building/setting/Setting.vue

@@ -652,8 +652,8 @@ export default {
         res => {
           let { data } = res;
           if (data) {
-            this.searchTypeArr = data.runBuildingSearch.map(item=>{
-              return {val:item.value,text:item.name}
+            this.searchTypeArr = data.runBuildingSearch.map(item => {
+              return { val: item.value, text: item.name };
             });
             this.selectRuntags = data.runTags;
           }

+ 7 - 2
src/components/common/coropperUploadFile.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="container">
     <div>
-      <el-button :disabled="!canUpload" size="small" plain icon="el-icon-plus" @click="uploadFuc"
+      <el-button
+        :disabled="!canUpload"
+        size="small"
+        plain
+        icon="el-icon-plus"
+        @click="uploadFuc"
         >点击上传</el-button
       >
     </div>
@@ -218,7 +223,7 @@ export default {
       }
     },
     // 图片类型
-    accept:{
+    accept: {
       type: String,
       required: false,
       default: () => {

+ 6 - 3
src/components/community/video/Edit.vue

@@ -237,7 +237,7 @@
                       <el-input
                         type="number"
                         placeholder=""
-                           oninput="if (value > 99) value = 99;"
+                        oninput="if (value > 99) value = 99;"
                         v-model="form.sort"
                         style="width:100%"
                       >
@@ -539,7 +539,7 @@ export default {
         sort: [
           {
             required: true,
-         message: "请输入0-999正整数,数字越大排序约靠前",
+            message: "请输入0-999正整数,数字越大排序约靠前",
             trigger: "change"
           }
         ],
@@ -589,7 +589,10 @@ export default {
       cityArr: [],
       countryArr: [],
       videoCateArr: [],
-      statusArr: [{ id: "1", name: "上架" }, { id: "2", name: "下架" }],
+      statusArr: [
+        { id: "1", name: "上架" },
+        { id: "2", name: "下架" }
+      ],
       uploadVideoImgData: {
         project: "bms",
         contentType: "bms/building/list"

+ 4 - 4
src/components/community/video/Video.vue

@@ -258,15 +258,15 @@
 
 <script>
 import subHeader from "@/components/common/subHeader";
-import selectSearchCity from "@/components/common/selectSearchCity";
+// import selectSearchCity from "@/components/common/selectSearchCity";
 import detail from "./Detail";
 import create from "./Create";
 export default {
   components: {
     subHeader,
     detail,
-    create,
-    selectSearchCity
+    create
+    // selectSearchCity
   },
   data() {
     return {
@@ -279,7 +279,7 @@ export default {
       },
       dataId: "",
       status: null,
-      lang:null,  //语言环境选择
+      lang: null, //语言环境选择
       countryArr: [],
       cityArr: [],
       loadingFlag: false,

+ 4 - 1
src/components/content/friendship/Create.vue

@@ -102,7 +102,10 @@ export default {
         lang: [{ required: true, message: "请选择语言", trigger: "change" }]
         // cate: [{ required: true, message: "请选择链接类型", trigger: "change" }]
       },
-      langArr: [{ name: "中文", val: "1" }, { name: "英文", val: "2" }],
+      langArr: [
+        { name: "中文", val: "1" },
+        { name: "英文", val: "2" }
+      ],
       form: {
         name: "",
         url: "",

+ 4 - 1
src/components/content/websiteLinks/Create.vue

@@ -118,7 +118,10 @@ export default {
         lang: [{ required: true, message: "请选择语言", trigger: "change" }],
         cate: [{ required: true, message: "请选择链接类型", trigger: "change" }]
       },
-      langArr: [{ name: "中文", val: "1" }, { name: "英文", val: "2" }],
+      langArr: [
+        { name: "中文", val: "1" },
+        { name: "英文", val: "2" }
+      ],
       form: {
         name: "",
         url: "",

+ 4 - 1
src/components/content/websiteLinks/Edit.vue

@@ -125,7 +125,10 @@ export default {
         lang: [{ required: true, message: "请选择语言", trigger: "change" }],
         cate: [{ required: true, message: "请选择链接类型", trigger: "change" }]
       },
-      langArr: [{ name: "中文", val: 1 }, { name: "英文", val: 2 }],
+      langArr: [
+        { name: "中文", val: 1 },
+        { name: "英文", val: 2 }
+      ],
       form: {
         name: "",
         url: "",

+ 4 - 1
src/components/customService/problem/Create.vue

@@ -120,7 +120,10 @@ export default {
           { required: true, message: "请输入回答内容", trigger: "change" }
         ]
       },
-      statusArr: [{ name: "上架", val: "1" }, { name: "下架", val: "2" }],
+      statusArr: [
+        { name: "上架", val: "1" },
+        { name: "下架", val: "2" }
+      ],
       cateArr: [],
       form: {
         title: "",

+ 4 - 1
src/components/customService/problem/Edit.vue

@@ -130,7 +130,10 @@ export default {
         ],
         status: [{ required: true, message: "请选择状态", trigger: "change" }]
       },
-      statusArr: [{ name: "上架", val: "1" }, { name: "下架", val: "2" }],
+      statusArr: [
+        { name: "上架", val: "1" },
+        { name: "下架", val: "2" }
+      ],
       cateArr: [],
       form: {
         title: "",

+ 44 - 42
src/components/daily4StudyAbroad/material/CreateEdit.vue

@@ -192,7 +192,7 @@
 import MyUEditor from "@/components/common/MyUEditor";
 import UploadImgsFile from "@/components/common/UploadImgsFile";
 import Preview from "@/components/daily4StudyAbroad/Preview";
-import html2canvas from "html2canvas";
+// import html2canvas from "html2canvas";
 
 export default {
   components: { MyUEditor, UploadImgsFile, Preview },
@@ -229,8 +229,8 @@ export default {
         status: 2, // 上架状态,默认下架
         tagList: "", // 话题,[{id:'',tagName: ''}],目前一个,之后会多个
         content: "", // 内容
-        imgsUrl: [], // 列表图,从富文本取
-        contentSnapshot: "" // 富文本生成截图快照图片
+        imgsUrl: [] // 列表图,从富文本取
+        // contentSnapshot: "" // 富文本生成截图快照图片
       },
       // 表单校验规则
       formRules: {
@@ -302,17 +302,17 @@ export default {
       this.isVisible = false;
     },
     // 获取富文本的快照
-    getRichTextUrl(content) {
-      const params = {};
-      params.data = {
-        content: content,
-        contentType: "run/material/image",
-        fileType: "png",
-        project: "hooli"
-      };
-      params.url = this.$apis.api_common_files_base64;
-      return this.$net.req(params, this);
-    },
+    // getRichTextUrl(content) {
+    //   const params = {};
+    //   params.data = {
+    //     content: content,
+    //     contentType: "run/material/image",
+    //     fileType: "png",
+    //     project: "hooli"
+    //   };
+    //   params.url = this.$apis.api_common_files_base64;
+    //   return this.$net.req(params, this);
+    // },
     // 保存
     handleSave() {
       if (this.isSaveLock) {
@@ -348,34 +348,36 @@ export default {
         );
         formData.imgsUrl = JSON.stringify(formData.imgsUrl);
         Object.assign(params.data, formData);
-        const canvas = await html2canvas(
-          document.getElementById("html2canvasContent"),
-          {
-            allowTaint: true,
-            dpi: window.devicePixelRatio * 2,
-            scale: 2,
-            useCORS: true,
-            logging: false
-          }
-        );
-        const { code, data } = await this.getRichTextUrl(
-          canvas.toDataURL("image/jpeg", 0.3)
-        ).catch(() => {
-          return {
-            code: 555,
-            data: null
-          };
-        });
-        let contentSnapshot = "";
-        if (code === 0) {
-          const { host, url } = data;
-          contentSnapshot = `${host}/${url}`;
-        } else {
-          this.isSaveLock = false;
-          this.$message.error("生成内容快照图片失败,请重试");
-          return false;
-        }
-        Object.assign(params.data, formData, { contentSnapshot });
+
+        // const canvas = await html2canvas(
+        //   document.getElementById("html2canvasContent"),
+        //   {
+        //     allowTaint: true,
+        //     dpi: window.devicePixelRatio * 2,
+        //     scale: 2,
+        //     useCORS: true,
+        //     logging: false
+        //   }
+        // );
+        // const { code, data } = await this.getRichTextUrl(
+        //   canvas.toDataURL("image/jpeg", 0.3)
+        // ).catch(() => {
+        //   return {
+        //     code: 555,
+        //     data: null
+        //   };
+        // });
+        // let contentSnapshot = "";
+        // if (code === 0) {
+        //   const { host, url } = data;
+        //   contentSnapshot = `${host}/${url}`;
+        // } else {
+        //   this.isSaveLock = false;
+        //   this.$message.error("生成内容快照图片失败,请重试");
+        //   return false;
+        // }
+        // Object.assign(params.data, formData, { contentSnapshot });
+
         params.data = this.$utils.removeEmptyProperty(params.data);
         this.$net.req(params).then(
           res => {