kevin_zhangl 3 роки тому
батько
коміт
116d67d357

+ 4 - 4
backendEle/src/utils/tool.js

@@ -2,7 +2,7 @@ import errorCode from './errorCode'
 import baseInfo from './baseInfo'
 import userInfo from './userInfo'
 import router from '@/router'
-import {PRICE_IS_ROUND,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from './config'
+import {PRICE_IS_ROUND, CDN_BASE_URL} from './config'
 import ElementUI from 'element-ui'
 
 let tool = {
@@ -268,13 +268,13 @@ let tool = {
   },
 
   /**
-   * 拼装本机图片地址.
+   * 拼装图片地址.
    * @param imageUrl
    * @param path
    * @returns {string}
    */
-  getLocaleLink(imageUrl, path) {
-    return `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${path}${imageUrl}`;
+  getLocaleLink(imageUrl, path = '') {
+      return imageUrl.indexOf('http') > -1 ? imageUrl : `${CDN_BASE_URL}${path}${imageUrl}`;
   },
 }
 

+ 4 - 5
backendEle/src/views/ad/edit.vue

@@ -50,10 +50,9 @@ export default {
         this.form.content = response.oneData.CONTENT
 
         this.imageAd = response.oneData.IMAGE;
-        this.form.image = tool.getLocaleLink(response.oneData.IMAGE, '/uploads/');
-        this.defaultImageUrl = tool.getLocaleLink(response.oneData.IMAGE, '/uploads/');
+        this.form.image = tool.getLocaleLink(response.oneData.IMAGE, '/files/');
+        this.defaultImageUrl = tool.getLocaleLink(response.oneData.IMAGE, '/files/');
 
-        this.defaultImageUrl = response.oneData.IMAGE
         this.allLocation = response.allLocation
         this.loading = false
         this.isEdit = true
@@ -103,8 +102,8 @@ export default {
     },
     handleSuccess (imageUrl) {
       this.imageAd = imageUrl
-      this.form.image = tool.getLocaleLink(imageUrl, '/uploads/')
-      this.defaultImageUrl = tool.getLocaleLink(imageUrl, '/uploads/')
+      this.form.image = tool.getLocaleLink(imageUrl, '/files/')
+      this.defaultImageUrl = tool.getLocaleLink(imageUrl, '/files/')
     },
   }
 }

+ 1 - 1
backendEle/src/views/ad/list.vue

@@ -181,7 +181,7 @@ export default {
       })
     },
     getImage(imageUrl) {
-      return tool.getLocaleLink(imageUrl, '/uploads/');
+        return tool.getLocaleLink(imageUrl, '/files/');
     },
   }
 }

+ 1 - 1
backendEle/src/views/finance/recharge.vue

@@ -158,7 +158,7 @@
                     this.dialogInvoiceLoading = false
                     let invoiceUrl = response.list;
                     console.log(row)
-                    this.urlimg=tool.getLocaleLink(row.BANK_PROVE, '/uploads/')
+                    this.urlimg=tool.getLocaleLink(row.BANK_PROVE, '/files/')
                     console.log(this.urlimg)
 
                 })

+ 4 - 4
backendEle/src/views/shop/index.vue

@@ -160,9 +160,9 @@
                               placeholder="选择日期时间"
                               value-format="timestamp"
                               popper-class='goodsdate'>
-                            </el-date-picker>
-							
-		
+                            </el-date-picker>
+
+
 
                     </el-form-item>
                     </transition>
@@ -413,7 +413,7 @@
                     vueObj.form.goodsstatusdate=response.goodsInfo.GOODS_STATUS_DATE
                     vueObj.form.goodsdate=response.goodsInfo.GOODS_DATE * 1000
                     vueObj.form.coverOrigin = response.goodsInfo.COVER
-                    vueObj.form.cover = tool.getLocaleLink(response.goodsInfo.COVER, '/uploads/')
+                    vueObj.form.cover = tool.getLocaleLink(response.goodsInfo.COVER, '/files/')
 
                     this.$forceUpdate()
 

+ 1 - 1
common/models/forms/UploadForm.php

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

+ 4 - 4
frontendEle/src/utils/tool.js

@@ -1,6 +1,6 @@
 import errorCode from './errorCode'
 import baseInfo from './baseInfo'
-import {PRICE_IS_ROUND,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN} from './config'
+import {PRICE_IS_ROUND,SERVER_API_HTTP_TYPE,SERVER_API_DOMAIN,CDN_BASE_URL} from './config'
 import userInfo from "../../../backendEle/src/utils/userInfo";
 
 let tool = {
@@ -212,13 +212,13 @@ let tool = {
     },
 
   /**
-   * 拼装本机图片地址.
+   * 拼装图片地址.
    * @param imageUrl
    * @param path
    * @returns {string}
    */
-  getLocaleLink(imageUrl, path) {
-    return `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${path}${imageUrl}`;
+  getLocaleLink(imageUrl, path = '') {
+      return imageUrl.indexOf('http') > -1 ? imageUrl : `${CDN_BASE_URL}${path}${imageUrl}`;
   },
 }
 

+ 1 - 1
frontendEle/src/views/dashboard/index.vue

@@ -151,7 +151,7 @@
         })
       },
       imageArticle(imageUrl) {
-        return tool.getLocaleLink(imageUrl, '/uploads/');
+        return tool.getLocaleLink(imageUrl, '/files/');
       },
     }
   }

+ 3 - 3
frontendEle/src/views/finance/recharge.vue

@@ -146,7 +146,7 @@
                 this.$router.push({path: `/finance/recharge-add`})
             },
             handlePictureCardPreview(file) {
-                this.dialogImageUrl = tool.getLocaleLink(file.url, '/uploads/');
+                this.dialogImageUrl = tool.getLocaleLink(file.url, '/files/');
                 this.dialogVisible = true;
                 this.file=file;
                 // console.log(file);
@@ -203,7 +203,7 @@
                     this.dialogInvoiceLoading = false
                     let invoiceUrl = response.list;
                     console.log(row)
-                    this.urlimg=tool.getLocaleLink(row.BANK_PROVE, '/uploads/');
+                    this.urlimg=tool.getLocaleLink(row.BANK_PROVE, '/files/');
 
 
                 })
@@ -215,4 +215,4 @@
 
 <style scoped>
 
-</style>
+</style>

+ 6 - 7
frontendEle/src/views/shop/index.vue

@@ -7,18 +7,18 @@
                     type="selection"
                     width="55">
                 </el-table-column>
-                <!-- <el-table-column label="创建时间"> 
+                <!-- <el-table-column label="创建时间">
                      <template slot-scope="scope">
                         {{tool.formatDate(scope.row.CREATED_AT)}}
-                    </template> 
+                    </template>
                 </el-table-column> -->
                 <el-table-column label="商品名称" prop="GOODS_NAME">
-                   
+
                 </el-table-column>
 
                 <el-table-column label="图片" >
                      <template slot-scope="scope">
-                        <el-image style="width: 100px; height: 100px" :src="scope.row.COVER" :preview-src-list="[scope.row.COVER]"></el-image>
+                        <el-image style="width: 100px; height: 100px" :src="tool.getLocaleLink(scope.row.COVER, '/files/')" :preview-src-list="[tool.getLocaleLink(scope.row.COVER, '/files/')]"></el-image>
                      </template>
                 </el-table-column>
 
@@ -104,7 +104,7 @@
                         this.$router.push({path: `/shop/order`})
                     }
                 },0)
-                 
+
                 // if (rows) {
                 // rows.forEach(row => {
                 //     this.$refs.multipleTable.toggleRowSelection(row);
@@ -201,7 +201,6 @@
                                     break;
                                 }
                             }
-                            obj.tableData[i].COVER = tool.getLocaleLink(obj.tableData[i].COVER, '/uploads/')
                         }
                         obj.selectLock = false;
                     })
@@ -217,4 +216,4 @@
 .flex{
     display: flex;
 }
-</style>
+</style>

+ 6 - 5
frontendEle/src/views/shop/order.vue

@@ -10,11 +10,11 @@
                      <el-table-column label="商品名称" prop="GOODS_NAME">
                     </el-table-column>
 
-                    <el-table-column label="图片" >
-                        <template slot-scope="scope">
-                            <img :src="scope.row.COVER" alt="" style="width:100%">
-                        </template>
-                    </el-table-column>
+                  <el-table-column label="图片" >
+                    <template slot-scope="scope">
+                      <el-image style="width: 100px; height: 100px" :src="tool.getLocaleLink(scope.row.COVER, '/files/')" :preview-src-list="[tool.getLocaleLink(scope.row.COVER, '/files/')]"></el-image>
+                    </template>
+                  </el-table-column>
 
                     <el-table-column label="会员价格" prop="member_price">
                     </el-table-column>
@@ -95,6 +95,7 @@
         data(){
             return{
                 loading: true,
+                tool: tool,
                 goods:[],
                 payList:[],
                 all_address:[],