修改上传服务

backendEle/src/utils/tool.js

@@ -3,7 +3,7 @@ import baseInfo from './baseInfo'
 import userInfo from './userInfo'
 import router from '@/router'
 import network from '@/utils/network'
-import {PRICE_IS_ROUND, SERVER_API_DOMAIN} from './config'
+import {PRICE_IS_ROUND, CDN_BASE_URL} from './config'
 
 let tool = {
   /**
@@ -262,6 +262,16 @@ let tool = {
       window.location.href = window.location.href.replace(searchStr, '$1$2'+value+'$4')
     }
   },
+
+  /**
+   * 拼装图片
+   * @param imageUrl 图片
+   * @param path 路径
+   * @returns {string}
+   */
+  getArImage(imageUrl, path) {
+    return `${CDN_BASE_URL}${path}${imageUrl}`;
+  },
 }
 
 export default tool

backendEle/src/views/ad/edit.vue

@@ -41,7 +41,7 @@
 <script>
 import network from '../../utils/network'
 import LeoUploader from '../../components/Uploader'
-import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
+import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN,CDN_BASE_URL} from '@/utils/config'
 
 export default {
   name: 'ad_edit',
@@ -54,8 +54,8 @@ export default {
         this.form.type = response.oneData.TYPE
 
         this.imageAd = response.oneData.IMAGE;
-        this.form.image = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.oneData.IMAGE;
-        this.defaultImageUrl = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.oneData.IMAGE;
+        this.form.image = tool.getArImage(response.oneData.IMAGE, '/files/');
+        this.defaultImageUrl = tool.getArImage(response.oneData.IMAGE, '/files/');
 
         this.form.content = response.oneData.CONTENT
         if (response.oneData.TYPE === '1') {
@@ -121,8 +121,8 @@ export default {
     },
     handleSuccess (imageUrl) {
       this.imageAd = imageUrl
-      this.form.image = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
-      this.defaultImageUrl = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+      this.form.image = tool.getArImage(imageUrl, '/files/');
+      this.defaultImageUrl = tool.getArImage(imageUrl, '/files/');
     },
   },
   watch: {

backendEle/src/views/ad/list.vue

@@ -112,7 +112,7 @@ import tool from '@/utils/tool'
 import store from '@/utils/vuexStore'
 import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
-import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
+import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN,CDN_BASE_URL} from '@/utils/config'
 import article from "../article";
 
 export default {
@@ -272,7 +272,7 @@ export default {
       })
     },
     getImage(imageUrl) {
-      return SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+      return tool.getArImage(imageUrl, '/files/');
     },
     getContent(aid) {
       let titles = this.allArticle.filter(article => article.ID === aid).map(article => article.TITLE);

backendEle/src/views/article/detail.vue

@@ -12,11 +12,8 @@
 </template>
 
 <script>
-import Vue from 'vue'
 import network from '@/utils/network'
 import tool from '@/utils/tool'
-import store from '@/utils/vuexStore'
-import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
 
 export default {
   name: 'article_detail',
@@ -48,7 +45,7 @@ export default {
       })
     },
     getLink(fileUrl) {
-      return SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + fileUrl;
+      return tool.getArImage(fileUrl, '/files/');
     },
   }
 }

backendEle/src/views/file/export.vue

@@ -88,7 +88,7 @@
   import baseInfo from '@/utils/baseInfo'
   import store from '@/utils/vuexStore'
   import permission from '@/utils/permission'
-  import {SERVER_API_HTTP_TYPE, SERVER_API_DOMAIN} from '@/utils/config'
+  import {SERVER_API_HTTP_TYPE, SERVER_API_DOMAIN,CDN_BASE_URL} from '@/utils/config'
   import filterHelper from '../../utils/filterHelper'
 
   export default {

backendEle/src/views/finance/recharge.vue

@@ -52,13 +52,11 @@
 <script>
     import network from '@/utils/network'
     import tool from '@/utils/tool'
-    import baseInfo from '@/utils/baseInfo'
     import FilterUser from '../../components/FilterUser'
     import permission from '@/utils/permission'
     import Pagination from '@/components/Pagination'
     import filterHelper from '@/utils/filterHelper'
-    import {FRONTEND_SERVER,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
-    import store from './../../utils/vuexStore'
+
     export default {
         name: 'recharge',
         components: {FilterUser,Pagination},
@@ -151,10 +149,7 @@
                     console.log(response)
                     this.dialogInvoiceLoading = false
                     let invoiceUrl = response.list;
-                    console.log(row)
-                    this.urlimg= SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + row.BANK_PROVE;
-                    console.log(this.urlimg)
-
+                    this.urlimg = tool.getArImage(row.BANK_PROVE, '/files/');
                 })
             },
 

backendEle/src/views/shop/index.vue

@@ -165,7 +165,7 @@
     import permission from '@/utils/permission'
     import Pagination from '@/components/Pagination'
     import filterHelper from '@/utils/filterHelper'
-    import {FRONTEND_SERVER,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
+    import {FRONTEND_SERVER,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN,CDN_BASE_URL} from '@/utils/config'
     import store from './../../utils/vuexStore'
      import LeoUploader from '@/components/Uploader';
     export default {
@@ -255,7 +255,7 @@
             },
             upLoadSuccess(file){
                 // this.form.cover=file;
-                this.form.cover = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + file;
+                this.form.cover = tool.getArImage(file, '/files/');
                 this.form.coverOrigin = file
                 this.img_show=false;
             },
@@ -321,7 +321,7 @@
                     //   })
 
                     vueObj.form.coverOrigin = response.goodsInfo.COVER
-                    vueObj.form.cover = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + response.goodsInfo.COVER
+                    vueObj.form.cover = tool.getArImage(response.goodsInfo.COVER, '/files/');
 
                     this.$forceUpdate()
                 })

common/models/forms/UploadForm.php

@@ -180,7 +180,7 @@ class UploadForm extends Model {
                 // 生成文件名
                 $fileName = Tool::generateId(false);
                 // 保存在本地
-                $localPath = \Yii::getAlias('@common/runtime/uploads/') . $fileName . '.' . $this->file->extension;
+                $localPath = '/ng/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileName . '.' . $this->file->extension;
                 if (!$this->file->saveAs($localPath)) {
                     throw new Exception('Failed');
                 }

frontendEle/src/utils/tool.js

@@ -1,6 +1,6 @@
 import errorCode from './errorCode'
 import baseInfo from './baseInfo'
-import {PRICE_IS_ROUND} from './config'
+import {PRICE_IS_ROUND,CDN_BASE_URL} from './config'
 import userInfo from "../../../backendEle/src/utils/userInfo";
 
 let tool = {
@@ -215,6 +215,16 @@ let tool = {
       let taxAmount = (amount - amount / (1 + taxRate / 100)) * count
       return Math.round(taxAmount * 100) / 100
   },
+
+  /**
+   * 拼装图片
+   * @param imageUrl 图片
+   * @param path 路径
+   * @returns {string}
+   */
+  getArImage(imageUrl, path) {
+    return `${CDN_BASE_URL}${path}${imageUrl}`;
+  },
 }
 
 export default tool

frontendEle/src/views/dashboard/index.vue

@@ -72,7 +72,6 @@
   import baseInfo from '@/utils/baseInfo'
   import userInfo from '@/utils/userInfo'
   import countUp from 'vue-countup-v2'
-  import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
 
   export default {
     name: 'dashboard_index',
@@ -159,7 +158,7 @@
         }
       },
       imageArticle(imageUrl) {
-        return SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + imageUrl;
+        return tool.getArImage(imageUrl, '/files/');
       },
     }
   }

frontendEle/src/views/finance/recharge.vue

@@ -73,7 +73,7 @@ import tool from '@/utils/tool'
 import LeoFilter from '@/components/Filter'
 import LeoUploader from '@/components/Uploader'
 import Pagination from '@/components/Pagination'
-import {SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from '@/utils/config'
+
 export default {
   name: 'recharge',
   components: {LeoFilter, LeoUploader, Pagination},
@@ -146,7 +146,7 @@ export default {
       this.$router.push({path: `/finance/recharge-add`})
     },
     handlePictureCardPreview (file) {
-      this.dialogImageUrl = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + file.url;
+      this.dialogImageUrl = CDN_BASE_URL + '/files/' + file.url;
       this.dialogVisible = true;
       this.file = file;
       // console.log(file);
@@ -168,7 +168,7 @@ export default {
     handleAddInvoiceShow: function (row) {
       this.dialogAddInvoiceLoading = true
       this.auditId = row.ID
-      this.defaultImageUrl = row.BANK_PROVE
+      this.defaultImageUrl = tool.getArImage(row.BANK_PROVE, '/files/');
       // console.log(this.auditId)
       // this.requestRoute = 'finance/prove-add/' + this.auditId
       this.dialogAddInvoiceVisible = true
@@ -201,7 +201,7 @@ export default {
         this.dialogInvoiceLoading = false
         let invoiceUrl = response.list;
         // console.log(row)
-        this.urlimg = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + row.BANK_PROVE
+        this.urlimg = tool.getArImage(row.BANK_PROVE, '/files/');
         this.auditId = row.ID
       })
     },

frontendEle/src/views/shop/index.vue

@@ -75,15 +75,16 @@
 <script>
 import network from '@/utils/network'
 import tool from '@/utils/tool'
-import {SERVER_API_DOMAIN, SERVER_API_HTTP_TYPE} from '@/utils/config'
 import Pagination from '@/components/Pagination'
 
 export default {
         name: "index",
         components: {Pagination},
+        async created() {
+          await this.getData()
+        },
         mounted() {
             this.getGoodsActive()
-            this.getData()
         },
         data() {
             return {
@@ -238,9 +239,9 @@ export default {
                 }).catch(() => {
                 });
             },*/
-            getData (page, pageSize) {
+            async getData (page, pageSize) {
                 let obj = this
-                network.getPageData(this, `shop/index`, page, pageSize, { categoryType: obj.goodsCategory }, function (response) {
+                await network.getPageData(this, `shop/index`, page, pageSize, { categoryType: obj.goodsCategory }, function (response) {
                     obj.loading = false;
                     obj.currentPage = response.currentPage;
                     obj.list = response.list;
@@ -269,7 +270,7 @@ export default {
                                     break;
                                 }
                             }
-                            obj.tableData[i].COVER = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/uploads/' + obj.tableData[i].COVER
+                            obj.tableData[i].COVER = tool.getArImage(obj.tableData[i].COVER, '/files/');
                         }
                         obj.selectLock = false;
                     })

frontendEle/src/views/shop/order-backing-out.vue

@@ -39,5 +39,5 @@
 </script>
 
 <style scoped>
- 
+
 </style>

frontendEle/src/views/shop/order-list.vue

@@ -45,7 +45,7 @@
     import network from '@/utils/network'
     import tool from '@/utils/tool'
     import Pagination from '@/components/Pagination'
-    import {SERVER_API_HTTP_TYPE, SERVER_API_DOMAIN} from '@/utils/config'
+    import {SERVER_API_HTTP_TYPE, SERVER_API_DOMAIN,CDN_BASE_URL} from '@/utils/config'
     export default {
         name: "order-list",
         components: {Pagination},