Merge branch 'dev'

src/common/api/upload.js

@@ -6,5 +6,5 @@ export function uploadImg(file, params = {}) {
   for (const key in otherParams) {
   for (const key in otherParams) {
     from.append(key, otherParams[key])
     from.append(key, otherParams[key])
   }
   }
-  return axios.post(url || 'platform/upload/fileUpload/images', from)
+  return axios.post(url || 'upload/oss', from)
 }
 }
\ No newline at end of file

src/components/wangeditor/index.vue

@@ -98,10 +98,13 @@ export default {
               // JS 语法
               // JS 语法
               // res 即服务端的返回结果
               // res 即服务端的返回结果
 
 
-              const res = await uploadImg(files)
+              const res = await uploadImg(files, {
+                url: 'upload/oss',
+                businessType: 'other',
+              })
               console.log(res)
               console.log(res)
-              const { imagePath } = res
-              const url = _this.setimgUrl(imagePath, {
+              const { filePath } = res
+              const url = _this.setimgUrl(filePath, {
                 w: 640,
                 w: 640,
               })
               })
               // 从 res 中找到 url alt href ，然后插入图片
               // 从 res 中找到 url alt href ，然后插入图片

src/views/taskManage/index.vue

@@ -169,7 +169,7 @@
       title="详情"
       title="详情"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
       :visible.sync="detailVisible"
       :visible.sync="detailVisible"
-      width="900px"
+      width="1100px"
       @close="getlist()"
       @close="getlist()"
     >
     >
       <!-- <div class="step-bar">
       <!-- <div class="step-bar">
@@ -256,7 +256,7 @@
             >
             >
               <span class="label">工单内容</span>
               <span class="label">工单内容</span>
               <span
               <span
-                style="flex: 1; display: inline-block"
+                style="flex: 1; display: inline-block;padding:0 3%"
                 class="value"
                 class="value"
                 v-html="detail.content"
                 v-html="detail.content"
               ></span>
               ></span>