Browse Source

发版提交

zhuxinbo 4 years ago
parent
commit
f87cf1ac9d

+ 3 - 1
src/components/uploadFile.vue

@@ -33,6 +33,7 @@
   import moment from 'moment'
 
   import BMF from 'browser-md5-file'
+
   import qs from 'qs'
   var COS = require('cos-js-sdk-v5');
   var cos = new COS({
@@ -198,12 +199,13 @@
         MM = MM < 10 ? '0' + MM : MM
         let d = date.getDate()
         d = d < 10 ? '0' + d : d
+        var timeElse = new Date().getTime()
         cos.putObject({
           Bucket: 'media-1301855440',
           /* 必须 */
           Region: 'ap-chongqing',
           /* 存储桶所在地域,必须字段 */
-          Key: that.uploadType + '/' + y + '-' + MM + '-' + d + '/' + file.name,
+          Key: that.uploadType + '/' + y + '-' + MM + '-' + d + '/' + timeElse + '-' + file.name,
           /* 必须 */
           StorageClass: 'STANDARD',
           Body: file, // 上传文件对象

+ 1 - 1
src/views/modules/kuaishouapp/account/accountIndex.vue

@@ -729,7 +729,7 @@
       if (this.appId == '') {
         return
       } else {
-        this.addUser()
+        this.searchLabel()
       }
     }
   }

+ 11 - 1
src/views/modules/kuaishouapp/account/advertisingGroup.vue

@@ -96,6 +96,7 @@
               <!-- getCheckboxProps: getCheckboxProps -->
               <a slot="unitName" slot-scope="text, record" @click="toDetail(record)" :title="text">
                 <span
+                  :title="text"
                   style="display:block;width:250px !important;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">
                   {{ text }}</span>
 
@@ -112,6 +113,12 @@
               <span slot="status" slot-scope="text">{{ text | status }}</span>
               <span slot="putStatus" slot-scope="text">{{ text | putStatus }}</span>
               <span slot="createChannel" slot-scope="text">{{ text | createChannel }}</span>
+              <span slot="reviewDetail" slot-scope="text">
+                <span
+                  :title="text"
+                  style="margin:0;display:block;width:300px !important;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">
+                  {{ text }}</span>
+              </span>
               <span slot="bidType" slot-scope="text, record">
                 <!-- {{ text | bidType }} -->
                 {{ record.ocpxActionType | ocpxActionType }}</span>
@@ -405,7 +412,10 @@
     {
       title: '审核拒绝理由',
       align: 'center',
-      dataIndex: 'reviewDetail'
+      dataIndex: 'reviewDetail',
+      scopedSlots: {
+        customRender: 'reviewDetail'
+      }
     },
     {
       title: '出价类型',

+ 2 - 0
src/views/modules/kuaishouapp/account/originality.vue

@@ -578,6 +578,8 @@
     computed: {},
     activated() {
       this.titleKey = localStorage.getItem('originalityKey')
+      this.creativeIdTwo = ""
+      this.creativeName = ""
       console.log(this.$route.params)
       this.title = JSON.parse(localStorage.getItem('originality')).map(item => {
         return {

+ 1 - 1
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -331,7 +331,7 @@ li:hover {
       label="APP行为"
       :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
       :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
-      v-if="allForm.platform_os == 1"
+      v-if="allForm.platform_os == 1&&allForm.platform_os"
     >
       <a-radio-group buttonStyle="solid" v-model="allForm.appType" @change="getAppType">
         <a-radio-button value="0">不限</a-radio-button>

+ 1 - 1
src/views/ureport/UReportFileBindUserList.vue

@@ -97,7 +97,7 @@ export default {
       if (process.env.NODE_ENV === 'development') {
         url = 'http://39.106.184.70:8080/jeecg-boot/ureport/preview?_u=mysql:' + item.fileName
       } else if (process.env.NODE_ENV === 'production') {
-        url = 'http://129.28.150.229:8804/jeecg-boot/ureport/preview?_u=mysql:' + item.fileName
+        url = 'http://139.186.29.76:8804/jeecg-boot/ureport/preview?_u=mysql:' + item.fileName
       }
       window.open(url, '_blank')
     }

+ 2 - 2
src/views/ureport/UReportFileList.vue

@@ -191,7 +191,7 @@ export default {
       if (process.env.NODE_ENV === 'development') {
         url = 'http://api.tjyourong.com.cn/jeecg-boot/ureport/designer?_u=mysql:' + item.name
       } else if (process.env.NODE_ENV === 'production') {
-        url = 'http://129.28.150.229:8804/jeecg-boot/ureport/designer?_u=mysql:' + item.name
+        url = 'http://139.186.29.76:8804/jeecg-boot/ureport/designer?_u=mysql:' + item.name
       }
       window.open(url, '_blank')
     },
@@ -200,7 +200,7 @@ export default {
       if (process.env.NODE_ENV === 'development') {
         url = 'http://api.tjyourong.com.cn/jeecg-boot/ureport/designer'
       } else if (process.env.NODE_ENV === 'production') {
-        url = 'http://api.tjyourong.com.cn/jeecg-boot/ureport/designer'
+        url = 'http://139.186.29.76:8804/jeecg-boot/ureport/designer'
       }
       window.open(url, '_blank')
     },

+ 2 - 2
vue.config.js

@@ -71,9 +71,9 @@ module.exports = {
        
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
-        target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目