合并

src/api/index.ts

@@ -96,8 +96,8 @@ export const getADPlanlist = (
     account_name: string;
     ad_name: string;
     status: string;
-    begin_date: string;
-    end_date: string;
+    begin_date: any;
+    end_date: any;
     campaign_name: string;
     page: number;
   }> = { page: 1 }
@@ -118,7 +118,7 @@ export const getDeliveryStatList = (
   }> = { page: 1 }
 ): AxiosPromise<IList<deliveryPlanItem>> => {
   return axios("/delivery/stat", { params: query });
-}
+};
 
 /*
  * 获取平台列表
@@ -154,8 +154,6 @@ export const onStopDeliveryBook = (id: number) => {
   return axios("/stopDeliveryBook", { params: { id } });
 };
 
-
-
 /**
  * 自定义列
  * @param null
@@ -177,4 +175,11 @@ export const getDeliveryMoreStatList = (
   }> = { page: 1 }
 ): AxiosPromise<IList<deliveryPlanItem>> => {
   return axios("/delivery/moreStat", { params: query });
-}
+};
+
+/* 广告授权
+ * @param null
+ */
+export const getAdauth = () => {
+  return axios("/oauth/accountGrant");
+};

src/scss/index.scss

@@ -14,7 +14,7 @@ body {
 
 @font-face {
   font-family: "WebTitle";
-  src: url(http://normal-image.xiaovv-web.com/normal/2020-11-18-web-font-1.ttf);
+  src: url(//firemanage.oss-cn-hangzhou.aliyuncs.com/FE-resource/fonts/web-font.ttf);
 }
 
 .title-font {
@@ -56,7 +56,7 @@ body {
   }
 
   .web-container {
-    background: url(http://normal-image.xiaovv-web.com/normal/2020-11-13-background.svg)
+    background: url(//firemanage.oss-cn-hangzhou.aliyuncs.com/FE-resource/images/background.svg)
       #f0f2f5 no-repeat top left / contain fixed;
   }
 }

src/views/Login.vue

@@ -87,7 +87,7 @@ export default Login;
 <style lang="scss" scoped>
 .login-wrap {
   height: 100vh;
-  background: url(http://normal-image.xiaovv-web.com/normal/2020-11-13-background.svg)
+  background: url(//firemanage.oss-cn-hangzhou.aliyuncs.com/FE-resource/images/background.svg)
     #f0f2f5 no-repeat top left / contain;
 
   .title {

src/views/put/put-ad-account.vue

@@ -1,22 +1,25 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
-    <tool-bar :text="['email', 'account_id', 'account_name']"
-              :label="['邮箱', '账户ID', '用户名']"
-              v-model:loading="inSearching"
-              @confirm="onSearch">
+    <tool-bar
+      :text="['email', 'account_id', 'account_name']"
+      :label="['邮箱', '账户ID', '用户名']"
+      v-model:loading="inSearching"
+      @confirm="onSearch"
+    >
       <template #exbutton>
-        <a-button type="primary"
-                  class="ml-10">
+        <a-button type="primary" @click="handleClick" class="ml-10">
           授权
         </a-button>
       </template>
     </tool-bar>
-    <a-table :columns="columns"
-             :data-source="list"
-             :pagination="tablePageOptions"
-             :loading="loading.value"
-             @change="handleTableChange"
-             rowKey="id">
+    <a-table
+      :columns="columns"
+      :data-source="list"
+      :pagination="tablePageOptions"
+      :loading="loading.value"
+      @change="handleTableChange"
+      rowKey="id"
+    >
     </a-table>
   </div>
 </template>
@@ -26,7 +29,7 @@ import { defineComponent, reactive, toRefs, ref } from "vue";
 import ToolBar from "@/components/tool-bar/index.vue";
 import { TableColumnOfPutAdAccount } from "../_pageOptions/table-put";
 import usePagination from "@/hooks/usePagination";
-import { getAdPushList } from "@/api";
+import { getAdPushList, getAdauth } from "@/api";
 import { ADpushSimple, PageOptions } from "@/types/api";
 import useDebounceFn from "@/hooks/useDebounceFn";
 
@@ -34,7 +37,8 @@ const PutAdAccount = defineComponent({
   components: {
     ToolBar,
   },
-  setup() {
+  setup(a,b) {
+    console.log(a,b)
     let { loading, meta, tablePageOptions } = usePagination();
     const state = reactive({
       list: ref<ADpushSimple[]>([]),
@@ -74,9 +78,19 @@ const PutAdAccount = defineComponent({
         meta.value = res.data.meta;
       });
     };
-
-    return { ...toRefs(state), onSearch, handleTableChange };
+    return { ...toRefs(state), onSearch, handleTableChange};
   },
+  methods:{
+    async handleClick(){
+      let res:any = await getAdauth();
+
+      if(res.data && res.data.url){
+        window.open(res.data.url)
+      }else{
+        this.$message.error('暂未配置授权地址');
+      }
+    }
+  }
 });
 
 export default PutAdAccount;

src/views/put/put-ad-plan.vue

@@ -3,10 +3,12 @@
     <tool-bar
       :text="['account_name', 'email', 'ad_name', 'campaign_name']"
       :label="['账户名', '邮箱', '计划名称', '广告组名称']"
+       v-model:loading="inSearching"
+      @confirm="onSearch"
     >
       <template #picker>
-        <p class="label">日期</p>
-        <a-range-picker />
+        <p class="label" >日期</p>
+        <a-range-picker v-model:value="picker" :ranges="{ 本周: [moment(), moment().endOf('week')], '本月': [moment(), moment().endOf('month')] }" format="YYYY/MM/DD" />
       </template>
       <!-- <div class="tool-bar-item">
         <p class="label">计划状态</p>
@@ -28,8 +30,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, ref } from "vue";
-
+import { defineComponent, reactive, toRefs, ref ,unref} from "vue";
+import moment from 'moment';
 import ToolBar from "@/components/tool-bar/index.vue";
 import usePagination from "@/hooks/usePagination";
 import {
@@ -52,6 +54,7 @@ const PutAdPlan = defineComponent({
       list: ref<ADPlanItem[]>([]),
       inSearching: false,
       loading,
+      picker:[],
       tablePageOptions,
       columns: TableColumnOfPutAdPlan,
     });
@@ -63,17 +66,19 @@ const PutAdPlan = defineComponent({
           account_name,
           ad_name,
           status,
-          begin_date,
-          end_date,
           campaign_name,
         } = fields;
+      const  {picker} = state;
+      let [begin_dates,end_dates] = picker;
+      let begin_date =  moment(begin_dates).format('YYYY-MM-DD');
+      let end_date =  moment(end_dates).format('YYYY-MM-DD');
         const { data } = await getADPlanlist({
           email,
           account_name,
           ad_name,
-          status,
           begin_date,
           end_date,
+          status,
           campaign_name,
           page: 1,
         });
@@ -82,7 +87,6 @@ const PutAdPlan = defineComponent({
       } catch (e) {
         console.log(e);
       } finally {
-        console.log(state.inSearching);
         state.inSearching = false;
       }
     };
@@ -109,8 +113,11 @@ const PutAdPlan = defineComponent({
         meta.value = res.data.meta;
       });
     };
-    return { ...toRefs(state), handleTableChange };
+    return { ...toRefs(state), handleTableChange,onSearch };
   },
+  methods:{
+     moment,
+  }
 });
 
 export default PutAdPlan;