Ver Fonte

年前封板

朱鑫波 há 3 anos atrás
pai
commit
981d826b91

+ 1 - 1
.env.production

@@ -7,7 +7,7 @@ VUE_APP_BASE_REPORT_URL = http://api.tjyourong.com.cn/reportModule
 # 线上地址 http://api.tjyourong.com.cn
 
 #脚本视频接口
-VUE_APP_BASE_SCRIPT_URL = http://192.168.0.195:31013
+VUE_APP_BASE_SCRIPT_URL = http://114.117.193.186:31013
 # 线上地址 http://114.117.193.186:31013
 # 测试地址 http://139.186.134.115:31013
 # 新测试地址 http://192.168.0.195:31013

+ 55 - 0
src/views/modules/advertiser/ProjectMemberList.vue

@@ -59,6 +59,29 @@
         </div>
         <div v-else>-</div>
       </span>
+      <span slot="ocpxActionType" slot-scope="text,record">
+        <div v-if="!!record.ocpxActionType&&JSON.parse(record.ocpxActionType).length>0">
+          <span v-for="(item, index)  in JSON.parse(record.ocpxActionType)" :key="index"
+            >{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br>
+            <!-- <span v-if="item instanceof Object">{{item.ocpxName}}({{(item.maxValue / 1000).toFixed(2)}})<br></span>
+            <span v-else>{{(item / 1000).toFixed(2)}}</span> -->
+            </span
+          >
+        </div>
+        <div v-else>-</div>
+
+        <!-- {{ text | ocpxActionType }} -->
+      </span>
+      <span slot="deepConversionType" slot-scope="text,record">
+        <div v-if="!!record.deepConversionType&&JSON.parse(record.deepConversionType).length != 0">
+          <span v-for="(item, index)  in JSON.parse(record.deepConversionType)" :key="index"
+            >{{item.deepName}}({{(item.deepValue / 1000).toFixed(2)}})<br></span
+          >
+        </div>
+        <div v-else>-</div>
+
+        <!-- {{ text | ocpxActionType }} -->
+      </span>
         <span slot="maxBid" slot-scope="maxBid,record">{{ record.maxBid == 0? '-': (record.maxBid / 1000).toFixed(2) }}</span>
         <span slot="mediaId" slot-scope="mediaId">{{
           mediaId == 1 ? '头条' : mediaId == 2 ? '快手' : mediaId == 3 ? '头条内广' : mediaId == 4 ? '快手内广':mediaId== 5 ? '千川' :'磁力金牛'
@@ -420,6 +443,22 @@ const myProjectColumns = [
     },
   },
   {
+    title: '转化目标(出价/元)',
+    align: 'center',
+    dataIndex: 'ocpxActionType',
+    scopedSlots: {
+      customRender: 'ocpxActionType',
+    },
+  },
+  {
+    title: '深度转化目标(出价)',
+    align: 'center',
+    dataIndex: 'deepConversionType',
+    scopedSlots: {
+      customRender: 'deepConversionType',
+    },
+  },
+  {
     title: '操作',
     dataIndex: 'action',
     align: 'center',
@@ -479,6 +518,22 @@ const participationColumns = [
     },
   },
   {
+    title: '转化目标(出价/元)',
+    align: 'center',
+    dataIndex: 'ocpxActionType',
+    scopedSlots: {
+      customRender: 'ocpxActionType',
+    },
+  },
+  {
+    title: '深度转化目标(出价)',
+    align: 'center',
+    dataIndex: 'deepConversionType',
+    scopedSlots: {
+      customRender: 'deepConversionType',
+    },
+  },
+  {
     title: '操作',
     dataIndex: 'action',
     align: 'center',

+ 1 - 1
src/views/modules/autoLaunch/trusteeship/creatMaterialTest.vue

@@ -1745,7 +1745,7 @@ export default {
                     this.$nextTick(() => {
                         let data = res.result
                         this.accountIds = data.accountId
-                        data.sceneIds = data.sceneIds ? data.sceneIds : [1]
+                        data.sceneIds = data.sceneIds ? JSON.parse(data.sceneIds) : [1]
                         this.formProject.setFieldsValue(pick(data, 'campaignType', 'sceneIds'))
                         this.$nextTick(() => {
                             this.getActionBarText()

+ 3 - 2
src/views/modules/material/videoMaterial.vue

@@ -848,7 +848,7 @@ a {
                         <a-menu-item
                           key="1"
                           v-show="active != '3'"
-                          v-if="items.userId == userInfo().id || role.roleCode == 'designTeamLeader'"
+                          v-if="items.userId == userInfo().id || role.roleCode == 'designTeamLeader'|| userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'"
                         >
                           <a href="javascript:;" style="margin-right: 20px" @click="personEdit(items, '2')">人员修改</a>
                         </a-menu-item>
@@ -861,7 +861,8 @@ 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 == '6a2e036486ea480ab3d9870e2d810daf' && items.projectId == 4830885)">
+                        <a-menu-item key="6"  v-show="userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'||active !== '1'"  
+                        v-if="items.userId == userInfo().id ||(userInfo().id == '6a2e036486ea480ab3d9870e2d810daf' && items.projectId == 4830885) || userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'">
                           <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'">