소스 검색

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

liubei@c-top.com.cn 3 년 전
부모
커밋
87a626db6c

+ 3 - 1
src/mixins/JeecgListMixin.js

@@ -9,6 +9,7 @@ import {deleteAction, getAction, downFile} from '@/api/manage'
 import Vue from 'vue'
 import {ACCESS_TOKEN} from "@/store/mutation-types"
 import { transformTozTreeFormat } from '@/utils/util.js'
+import {mapGetters} from 'vuex';
 export const JeecgListMixin = {
   data() {
     return {
@@ -63,6 +64,7 @@ export const JeecgListMixin = {
     this.initDictConfig();
   },
   methods: {
+    ...mapGetters(['nickname', 'avatar', 'userInfo']),
     // 二级树
     expand(expanded,record){
         if(this.url.listTwo){
@@ -144,7 +146,7 @@ export const JeecgListMixin = {
       // if(params.endDate){
       //   params.endDate = moment(params.endDate).format('YYYY-MM-DD')
       // }
-
+      params.userId = this.userInfo().id
       this.loading = true;
       await getAction(this.url.list, params).then((res) => {
         if (res.success) {

+ 3 - 0
src/mixins/videoMaterialMixin.js

@@ -9,6 +9,7 @@
  import Vue from 'vue'
  import {ACCESS_TOKEN} from "@/store/mutation-types"
  import { transformTozTreeFormat } from '@/utils/util.js'
+ import {mapGetters} from 'vuex';
  export const JeecgListMixin = {
    data() {
      return {
@@ -93,6 +94,7 @@
              }
          }
      },
+     ...mapGetters(['nickname', 'avatar', 'userInfo']),
      async loadData(arg) {
        this.cancel()
        this.spinning= true
@@ -144,6 +146,7 @@
         params.syncBytedance = null
       }
        this.loading = true;
+       params.userId = this.userInfo().id
        await getAction(this.url.list, params).then((res) => {
          if (res.success) {
            this.loading = false;

+ 4 - 2
src/views/modules/account-config/components/configuration-modal.vue

@@ -320,7 +320,9 @@
                             </a-checkbox-group>
                         </div>
                     </div>
-                    <a-form-model-item v-if="configForm.checkboxChangeValue.length === 1 && configForm.checkboxChangeValue[0] === 'INVENTORY_UNION_SLOT'" label="投放形式">
+                    <a-form-model-item v-if="
+                    (configForm.checkboxChangeValue.length === 1 && configForm.checkboxChangeValue[0] === 'INVENTORY_UNION_SLOT')
+                    " label="投放形式">
                         <a-radio-group
                             v-model="configForm.adUnionVideoType"
                             button-style="solid"
@@ -917,7 +919,7 @@
                             </a-radio-group>
                         </a-form-model-item> -->
                     </div>
-                    <div v-else-if="configForm.adUnionVideoType === 'ORIGINAL_VIDEO'">
+                    <div v-else-if="configForm.adUnionVideoType === 'ORIGINAL_VIDEO'||(configForm.checkboxChangeValue.length === 1 && configForm.checkboxChangeValue[0] === 'INVENTORY_TOMATO_NOVEL')">
                         <a-form-model-item label="创意内容">
                             <a-radio-group v-model="configForm.creativeImageMode" button-style="solid"  @change="handleChangeCreativeType">
                                 <a-radio-button value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">竖版视频</a-radio-button>

+ 4 - 4
src/views/modules/advertiser/ProjectList.vue

@@ -362,10 +362,10 @@ export default {
         })
         .finally(() => {})
     },
-    searchQuery(){
-      this.queryParam.userId = this.userInfo().id;
-      this.getList();
-    },
+    // searchQuery(){
+    //   this.queryParam.userId = this.userInfo().id;
+    //   this.getList();
+    // },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },

+ 2 - 2
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -3793,7 +3793,7 @@ export default {
                                     if (res.success) {
                                         this.sumbitLoading = false
                                         localStorage.removeItem('createLaunch')
-                                        // window.close()
+                                        window.close()
                                     } else {
                                         this.sumbitLoading = false
                                         this.$message.error('创建失败')
@@ -3804,7 +3804,7 @@ export default {
                                     if (res.success) {
                                         this.sumbitLoading = false
                                         localStorage.removeItem('createLaunch')
-                                        // window.close()
+                                        window.close()
                                     } else {
                                         this.sumbitLoading = false
                                         this.$message.error(res.message)

+ 5 - 1
src/views/modules/material/videoMaterial.vue

@@ -504,6 +504,7 @@ a {
         @click="passTheAudit"
         :disabled="checkArr.length == 0"
         v-if="active == '0'"
+        :loading="passTheAuditLoading"
         type="primary"
         >批量通过审核</a-button
       >
@@ -860,7 +861,7 @@ a {
                         <a-menu-item key="5">
                           <a href="javascript:;" style="margin-right: 20px" @click="editTagList(items)">修改标签</a>
                         </a-menu-item>
-                        <a-menu-item key="6"  v-show="active !== '1'"  v-if="items.userId == userInfo().id ||(userInfo().id == 'a549d89000eb432d80af11e1be8a623a' && items.projectId == 4830885)">
+                        <a-menu-item key="6"  v-show="active !== '1'"  v-if="items.userId == userInfo().id ||(userInfo().id == '6a2e036486ea480ab3d9870e2d810daf' && items.projectId == 4830885)">
                           <a href="javascript:;" style="margin-right: 20px" @click="editMaterialName(items)">修改素材名称</a>
                         </a-menu-item>
                         <a-menu-item key="7" v-show="active === '0' || active === '1'">
@@ -2381,6 +2382,7 @@ export default {
 				scopedSlots: {customRender: 'refuseDetail'}
 			},
 		],
+    passTheAuditLoading:false,
 		toutiaoMateriaLoading: false,
 		defaultCurrentToutiao: 1,
 		materiaDataTotalToutiao: 0,
@@ -3545,7 +3547,9 @@ export default {
       if(this.checkArr.length == 0){
         this.$message.error('请选择素材')
       }else{
+        this.passTheAuditLoading = true
         this.postDataAction('/ctop/materialInfo/batchEditStatus', {ids:this.checkArr, status:'1'}).then(res=>{
+          this.passTheAuditLoading = false
           if(res.success){
             this.$message.success(res.message)
             this.checkArr = []

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ module.exports = {
         // target: 'http://192.168.1.59:7701', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要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://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目