浏览代码

'合并代码智能投放'

魏志佳 4 年之前
父节点
当前提交
e9f0f402fe

+ 0 - 9
src/views/modules/autoLaunch/newAppId.vue

@@ -282,18 +282,9 @@ export default {
             else if (process.env.NODE_ENV == 'debug') { 
             } 
             else if (process.env.NODE_ENV == 'production') { 
-<<<<<<< HEAD
-              
-               this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/ai/aiKuaiShouAppInfo/importAppExcel?accountId=${this.accountId}&platform=${this.platform}&imageToken=${this.urlListImage.imageToken}`
-             
-            }
-           
-            
-=======
 
               this.uploadAction= `${this.axios.defaults.baseURL}/ai/aiKuaiShouAppInfo/importAppExcel?accountId=${this.accountId}&platform=${this.platform}&imageToken=${this.urlListImage.imageToken}`
             }
->>>>>>> test-2
 
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 0 - 5
src/views/modules/workBench/materialList.vue

@@ -1497,10 +1497,6 @@ export default {
 
 
         beforeUpload(file) {
-<<<<<<< HEAD
-
-            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
-=======
             if (process.env.NODE_ENV == 'development') { 
                 this.uploadAction= `/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             } 
@@ -1510,7 +1506,6 @@ export default {
               this.uploadAction= `${this.axios.defaults.baseURL}/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             }
             // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
->>>>>>> test-2
             // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             this.loadDisabled = true

+ 0 - 4
src/views/modules/workBench/orderDetail.vue

@@ -1884,9 +1884,6 @@ export default {
 
 
         beforeUpload(file) {
-<<<<<<< HEAD
-            this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-=======
             if (process.env.NODE_ENV == 'development') { 
                 this.uploadAction= `/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
             } 
@@ -1896,7 +1893,6 @@ export default {
               this.uploadAction= `${this.axios.defaults.baseURL}/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
             }
             //  this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
->>>>>>> test-2
             // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
             // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`