Merge branch 'dev_ren' into 'dev'

Dev ren

See merge request !29

src/api/website/aboutUs/index.js

+/*
+ * @Author: Jenkins
+ * @Date: 2020-12-15 16:00:02
+ * @LastEditTime: 2020-12-21 14:26:39
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \rs-cloud-platform-ui\src\api\website\aboutUs\index.js
+ */
 import fetch from 'utils/fetch';
 
 // 获取详情
-export function getCompanyInfo(params) {
+export function companyInfo(params) {
     return fetch({
         url: "/api/website/companyInfo",
         method: 'get',
@@ -10,9 +18,9 @@ export function getCompanyInfo(params) {
 }
 
 //编辑详情
-export function setCompanyInfo(params){
+export function addUpdate(params){
     return fetch({
-        url: "/api/website/companyInfo/addUpdate/",
+        url: "/api/website/companyInfo/addUpdate",
         method: 'post',
         data: params
     })

src/components/Upload/singleImageX.vue

@@ -9,10 +9,11 @@
       :http-request="onUploadRequest"
       :show-file-list="false"
       :multiple="false"
-      :limit="1">
+      :limit="1"
+    >
       <i class="el-icon-upload"></i>
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-      <div class="el-upload__text">只能上传1个文件</div>
+      <div class="el-upload__text">只能上传1张图片</div>
     </el-upload>
     <div class="image-preview" v-show="value">
       <div class="image-preview-wrapper">
@@ -33,7 +34,7 @@ export default {
   props: {
     refName: {
       type: String,
-      default: 'upload'
+      default: "upload",
     },
     //图片地址
     value: {
@@ -43,19 +44,19 @@ export default {
   },
   data() {
     return {
-      uploading: false
+      uploading: false,
     };
   },
   mounted() {
-    this.$bus.$on('upload-clearFiles', this.clearFiles)
+    this.$bus.$on("upload-clearFiles", this.clearFiles);
   },
   beforeDestroy() {
-    this.$bus.$off('upload-clearFiles')
+    this.$bus.$off("upload-clearFiles");
   },
   methods: {
     //清空上传过的图片
     clearFiles() {
-      this.$refs[this.refName].clearFiles()
+      this.$refs[this.refName].clearFiles();
     },
     //删除图片
     rmImage() {
@@ -68,13 +69,13 @@ export default {
       let fileObj = data.file;
       //获取图片详情信息
       let imgInfo = {};
-      let temp = URL.createObjectURL(fileObj)
+      let temp = URL.createObjectURL(fileObj);
       let img = new Image();
       img.src = temp;
       img.onload = function () {
         imgInfo.width = img.width;
         imgInfo.height = img.height;
-      }
+      };
       imgInfo.size = fileObj.size;
       imgInfo.type = fileObj.type;
       // FormData 对象
@@ -82,21 +83,21 @@ export default {
       // 文件对象
       form.append("file", fileObj);
 
-      uploadFile(form).then(res => {
+      uploadFile(form).then((res) => {
         this.uploading = false;
 
         if (res.status == 200) {
-          this.emitFunc(res.data, imgInfo)
+          this.emitFunc(res.data, imgInfo);
         } else {
           this.emitFunc("", null);
-          this.$message.error(res.message)
+          this.$message.error(res.message);
         }
-      })
+      });
     },
     //组件通信
     emitFunc(val, info = null) {
-      this.$emit('input', val, info)
-    }
+      this.$emit("input", val, info);
+    },
   },
 };
 </script>
@@ -153,4 +154,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

src/views/webSiteManagement/aboutUs/index.vue

 <!--
  * @Author: your name
  * @Date: 2020-12-01 09:07:41
- * @LastEditTime: 2020-12-18 13:19:25
+ * @LastEditTime: 2021-01-06 11:26:39
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \rs-cloud\src\views\webSiteManagement\aboutUs.vue

src/views/webSiteManagement/industryApplication/applicationCate/index.vue

 <!--
  * @Author: your name
  * @Date: 2020-12-02 10:27:53
- * @LastEditTime: 2020-12-11 17:15:00
+ * @LastEditTime: 2021-01-06 11:24:23
  * @LastEditors: Please set LastEditors
  * @Description: 类别管理
  * @FilePath: \rs-cloud-platform-ui\src\views\webSiteManagement\industryApplication\applicationList\index.vue
@@ -529,6 +529,9 @@ export default {
             }
           });
         }
+        this.tableData.forEach((obj,index)=> {
+          obj.index = ((this.typePagination.currentPage-1)*this.typePagination.pageSize)+(++index)
+        })
       }
     },
     // 删除类型

src/views/webSiteManagement/industryApplication/transactionProtection/index.vue

 <!--
  * @Author: your name
  * @Date: 2020-12-17 16:06:03
- * @LastEditTime: 2020-12-18 13:15:37
+ * @LastEditTime: 2020-12-25 13:09:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \rs-cloud-platform-ui\src\views\webSiteManagement\industryApplication\transactionProtection\index.vue
@@ -696,7 +696,7 @@ export default {
   .pagination {
     margin: 1% 1% 0 1%;
     width: 98%;
-    height: auto;
+    height: auto;  
   }
 }
 </style>

src/views/webSiteManagement/newsCategory/nebulaDynamics/index.vue

@@ -329,7 +329,7 @@
 
       </div>
     </el-dialog> -->
-    <!-- 使用图片查看器预览当前缩略图 -->
+    <!-- 使用图片查看器预览当前缩略图  -->
     <el-image-viewer
       v-if="currentIcon.showPreview"
       :on-close="closePreview"