Bläddra i källkod

🐞 fix:
广告组合: 创建功能异常;
展示型推广SD: 请求url错误;

WanGxC 1 år sedan
förälder
incheckning
7900aa056f

+ 58 - 59
src/views/adManage/portfolios/api.ts

@@ -1,100 +1,99 @@
 import { request } from '/@/utils/service'
 import { AddReq, DelReq, EditReq, InfoReq, UserPageQuery } from '@fast-crud/fast-crud'
-import {storeToRefs} from 'pinia'
-import {useShopInfo} from '/@/stores/shopInfo'
+import { storeToRefs } from 'pinia'
+import { useShopInfo } from '/@/stores/shopInfo'
 import { usePublicData } from '/@/stores/publicData'
 
-
 const publicData = usePublicData()
 const { dateRange } = storeToRefs(publicData)
 const shopInfo = useShopInfo()
-const {profile} = storeToRefs(shopInfo)
+const { profile } = storeToRefs(shopInfo)
 
 export const apiPrefix = '/api/ad_manage/portfolios/'
 export function GetList(query: UserPageQuery) {
-	const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
+  const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
 
-	return request({
-		url: apiPrefix,
-		method: 'get',
-		params: updatedQuery,
-	})
+  return request({
+    url: apiPrefix,
+    method: 'get',
+    params: updatedQuery,
+  })
 }
 export function GetAllPortfolios() {
-	return request({
-		url: apiPrefix + 'select_list',
-		method: 'get',
-		params: { limit: 999 },
-	})
+  return request({
+    url: apiPrefix + 'select_list',
+    method: 'get',
+    params: { limit: 999 },
+  })
 }
 export function GetObj(id: InfoReq) {
-	return request({
-		url: apiPrefix + id,
-		method: 'get',
-	})
+  return request({
+    url: apiPrefix + id,
+    method: 'get',
+  })
 }
 
 export function AddObj(obj: AddReq) {
-	const updatedObj = { ...obj, profileId: profile.value.profile_id };
-	return request({
-		url: apiPrefix,
-		method: 'post',
-		data: updatedObj,
-	})
+  const updatedObj = { ...obj, profileId: profile.value.profile_id }
+  return request({
+    url: apiPrefix + 'create/',
+    method: 'post',
+    data: updatedObj,
+  })
 }
 
 export function UpdateObj(obj: EditReq) {
-	return request({
-		url: apiPrefix + obj.id + '/',
-		method: 'put',
-		data: obj,
-	})
+  return request({
+    url: apiPrefix + obj.id + '/',
+    method: 'put',
+    data: obj,
+  })
 }
 
 export function DelObj(id: DelReq) {
-	return request({
-		url: apiPrefix + id + '/',
-		method: 'delete',
-		data: { id },
-	})
+  return request({
+    url: apiPrefix + id + '/',
+    method: 'delete',
+    data: { id },
+  })
 }
 
 export function getCardData(query: UserPageQuery) {
-	const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
+  const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
 
-	return request({
-		url: apiPrefix + 'report/amount',
-		method: 'GET',
-		params: updatedQuery,
-	})
+  return request({
+    url: apiPrefix + 'report/amount',
+    method: 'GET',
+    params: updatedQuery,
+  })
 }
 
 export function getLineData(query: UserPageQuery) {
-	const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
+  const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
 
-	return request({
-		url: apiPrefix + 'report/trend/daily',
-		method: 'GET',
-		params: updatedQuery,
-	})
+  return request({
+    url: apiPrefix + 'report/trend/daily',
+    method: 'GET',
+    params: updatedQuery,
+  })
 }
 
 export function getLineWeekData(query: UserPageQuery) {
-	const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
+  const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
 
-	return request({
-		url: apiPrefix + 'report/trend/weekly',
-		method: 'GET',
-		params: updatedQuery,
-	})
+  return request({
+    url: apiPrefix + 'report/trend/weekly',
+    method: 'GET',
+    params: updatedQuery,
+  })
 }
 
 export function getLineMonthData(query: UserPageQuery) {
-	const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
+  const updatedQuery = { ...query, startDate: dateRange.value[0], endDate: dateRange.value[1], name: query.name }
 
-	return request({
-		url: apiPrefix + 'report/trend/monthly',
-		method: 'GET',
-		params: updatedQuery,
-	})
+  return request({
+    url: apiPrefix + 'report/trend/monthly',
+    method: 'GET',
+    params: updatedQuery,
+  })
 }

+ 14 - 5
src/views/adManage/portfolios/crud.tsx

@@ -4,7 +4,6 @@ import { inject, nextTick, ref, watch } from 'vue'
 import { BaseColumn } from '/@/views/adManage/utils/commonTabColumn.js'
 import emitter from '/@/utils/emitter'
 
-
 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   // 通过 update 控制趋势图刷新
   let update = 0
@@ -23,7 +22,9 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
     return await api.DelObj(row.id)
   }
   const addRequest = async ({ form }: AddReq) => {
-    return await api.AddObj(form)
+    const res = await api.AddObj(form)
+    emitter.emit('protfolios-createProtfolios', res)
+    return res
   }
 
   //权限判定
@@ -124,11 +125,11 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
           },
           search: {
             show: true,
-						autoSearchTrigger: false,
+            autoSearchTrigger: false,
             component: {
               props: {
-								clearable: true,
-							},
+                clearable: true,
+              },
               placeholder: '请输入广告组合',
             },
           },
@@ -139,6 +140,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 
         state: {
           title: '状态',
+          column: {
+            width: '90px',
+            align: 'center',
+          },
           type: 'dict-select',
           dict: dict({
             data: [
@@ -152,6 +157,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
         },
         budget_policy: {
           title: '预算类型',
+          column: {
+            width: '120px',
+            align: 'left',
+          },
           type: 'dict-select',
           dict: dict({
             data: [

+ 11 - 0
src/views/adManage/portfolios/index.vue

@@ -41,6 +41,9 @@ import { useShopInfo } from '/@/stores/shopInfo'
 import { usePublicData } from '/@/stores/publicData'
 import { storeToRefs } from 'pinia'
 import emitter from '/@/utils/emitter'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+
 
 const shopInfo = useShopInfo()
 const publicData = usePublicData()
@@ -59,6 +62,14 @@ emitter.on('protfolios-update', (value: any) => {
   }
 })
 
+emitter.on('protfolios-createProtfolios', (value: any) => {
+	if(value.data.msg == 'success') {
+		ElMessage.success('创建成功')
+	} else {
+		ElMessage.error('创建失败')
+	}
+})
+
 const queryParams = ref({
   profileId: profile.value.profile_id,
   dateRange: updateDateRange,

+ 1 - 1
src/views/adManage/sd/audiences/chartComponents/adStruct.vue

@@ -27,7 +27,7 @@
 import { onMounted, ref, inject, computed, watch } from 'vue'
 import * as echarts from 'echarts'
 import TextSelector from '/@/components/TextSelector/index.vue'
-import { getAdStructureData } from '/@/views/adManage/sp/targets/api'
+import { getAdStructureData } from '/@/views/adManage/sd/targets/api'
 import { createDisabledOptions } from '../../../utils/dropdowndisable'
 import { barOptions1, barOptions2, barOptionsMap } from '/@/views/adManage/utils/enum'
 import { useShopInfo } from '/@/stores/shopInfo'

+ 2 - 2
src/views/adManage/sd/matchedDelivery/index.vue

@@ -13,9 +13,9 @@
               :fetchLine="getLineData"
             ></DataTendencyChart>
           </el-tab-pane>
-          <el-tab-pane label="广告结构" name="adStruct">
+          <!-- <el-tab-pane label="广告结构" name="adStruct">
             <AdStructChart v-if="tabActiveName === 'adStruct'" />
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="散点视图" name="scatterView"></el-tab-pane>
         </el-tabs>
       </template>

+ 2 - 2
src/views/adManage/sd/promoteProducts/index.vue

@@ -14,9 +14,9 @@
             >
             </DataTendencyChart>
           </el-tab-pane>
-          <el-tab-pane label="广告结构" name="adStruct">
+          <!-- <el-tab-pane label="广告结构" name="adStruct">
             <AdStructChart v-if="tabActiveName === 'adStruct'" />
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="散点视图" name="scatterView"></el-tab-pane>
         </el-tabs>
       </template>

+ 1 - 1
src/views/adManage/sd/targets/chartComponents/adStruct.vue

@@ -27,7 +27,7 @@
 import { onMounted, ref, inject, computed, watch } from 'vue'
 import * as echarts from 'echarts'
 import TextSelector from '/@/components/TextSelector/index.vue'
-import { getAdStructureData } from '/@/views/adManage/sp/targets/api'
+import { getAdStructureData } from '/@/views/adManage/sd/targets/api'
 import { createDisabledOptions } from '../../../utils/dropdowndisable'
 import { barOptions1, barOptions2, barOptionsMap } from '/@/views/adManage/utils/enum'
 import { useShopInfo } from '/@/stores/shopInfo'