Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -73,6 +73,17 @@ const routes = [{
     }
   },
    {
+    path: '/agent/ocpcList',
+    name: '站点列表',
+    isFirst: true,
+    component: () => import( /* webpackChunkName: "siteList" */ '../views/agent/ocpcList.vue'),
+    meta: {
+      title: 'OCPC订单',
+      breadcrumbParent: '首页',
+      hideBreadcrumb: true // 一级页面不显示面包屑
+    }
+  },
+  {
     path: '/agent/siteList',
     name: '站点列表',
     isFirst: true,

src/store/index.js

@@ -111,6 +111,21 @@ export default new Vuex.Store({
         children: [
           {
             index: '2-1',
+            title: '查重订单',
+            path: '/agent/checkList'
+          },
+          {
+            index: '2-2',
+            title: 'AI写作订单',
+            path: '/agent/aiList'
+          },
+          {
+            index: '2-3',
+            title: 'OCPC订单',
+            path: '/agent/ocpcList'
+          },
+          {
+            index: '2-4',
             title: 'ui页面',
             path: '/ui'
           }

src/views/agent/ocpcList.vue

@@ -0,0 +1,160 @@
+<template>
+    <div class="main-content12">
+        <!-- page header -->
+        <div class="pageheader">
+            <span class="pagetitle">OCPC订单</span>
+        </div>
+
+        <!-- page content -->
+        <div class="elementWrap">
+            <div>
+                <el-form>
+                    <div class="flex">
+                        <GuipInput :label="`ID：`" v-model="searchSaleid" @blur="changeSearchSaleid()" placeholder="" ref="GuipInput" class="searchId" />
+
+                        <GuipSelect label="站点" v-model="searchUid" :options="siteList"  valueKey="uid" labelKey="name" @change="changeSearchSite()"  defaultValue="" placeholder="不限" clearable class="searchSite" />
+                    </div>
+
+                    <GuipTable :tableData="orderList" ref="multipleTable" autoColumn="true" :loading="tableLoading">
+                        <el-table-column prop="sitename" label="站点"></el-table-column>
+                        <el-table-column prop="sale_id" label="ID"></el-table-column>
+                        <el-table-column prop="ocpc_type" label="渠道"></el-table-column>
+                        <el-table-column prop="type_desc" label="类型"></el-table-column>
+                        <el-table-column prop="money" label="销售金额"></el-table-column>
+                        <el-table-column prop="sale_date" label="销售日期"></el-table-column>
+                    </GuipTable>
+                    <el-pagination background @size-change='handleSizeChange' @current-change='handleCurrentChange'
+                        :current-page="orderListCurrentPage" 
+                        :page-size="orderListPageSize" 
+                        :total="orderListTotal"
+                        layout="prev, pager, next,jumper">
+                    </el-pagination>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+
+import GuipTable from '@/components/GuipTable.vue';
+import GuipSelect from '@/components/GuipSelect.vue';
+import GuipInput from '@/components/GuipInput.vue';
+
+export default {
+    name: 'siteList',
+    components: {
+        GuipTable,
+        GuipSelect,
+        GuipInput,
+    },
+    data() {
+        return {
+            // AUTH
+            token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3NTAwNTM3MjQsIm5iZiI6MTc1MDA1MzcyNCwiZXhwIjoxNzUyNjQ1NzI0LCJ1c2VyIjoic3VidXNlciIsImxvZ2luX3R5cGUiOjAsImFpZCI6IjEifQ.xyIqBLelB-k6jCifgRevBJTyg_Qrm6m1e4OcHhOpepU',
+            // 表格加载
+            tableLoading: true,
+            // 订单列表
+            orderList: [],
+            orderListTotal: 0,
+            orderListCurrentPage: 1,
+            orderListPageSize: 20,
+
+            siteList: [],
+
+            searchUid: 0,
+            searchSaleid: 0,
+        }
+    },
+    mounted() {
+        this.getOcpcList()
+    },
+    methods: {
+        getOcpcList() {
+            this.tableLoading = true
+            const that = this
+            that.orderList = []
+            this.$http('POST', '/agentnew/ajax_get_ocpc_order_list', {
+                page: this.orderListCurrentPage,
+                pagesize: this.orderListPageSize,
+                uid: this.searchUid,
+                saleid: this.searchSaleid,
+            },{
+                headers:{
+                    'Auth': this.token
+                }
+            }).then(response => {
+                this.tableLoading = false
+                this.$nextTick(() => {
+                    that.orderList = response.data.list
+                    this.orderListTotal = response.data.total
+                    this.siteList = response.data.sitelist
+                })
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
+        handleSizeChange(val) {
+            this.orderListPageSize = val
+            this.getOcpcList()
+        },
+        handleCurrentChange(val) {
+            this.orderListCurrentPage = val
+            this.getOcpcList()
+        },
+        changeSearchSite() {
+            console.log(this.searchUid)
+            this.getOcpcList()
+        },
+        changeSearchSaleid() {
+            console.log(this.searchSaleid)
+            this.getOcpcList()
+        },
+    },
+    computed: {
+        
+    },
+}
+</script>
+<style lang="scss" scoped>
+.pageheader {
+    display: flex;
+    justify-content: space-between;
+    /* 关键属性 */
+    align-items: center;
+    margin: 0px 0px 16px 0px;
+}
+
+.pagetitle {
+    font-size: 16px;
+    font-weight: bold;
+    line-height: normal;
+    letter-spacing: 0.08em;
+    color: #1E2226;
+    margin-top: 8px;
+}
+
+.elementWrap {
+    padding: 32px 36px;
+    background: #fff;
+}
+
+.searchId {
+    margin-right: 24px;
+    width: 200px;
+}
+
+.searchSite {
+    width: 300px;
+}
+
+::v-deep .custom-popover {
+    position: fixed !important;
+    // max-height: 290px;
+    // overflow-y: auto;
+    margin-top: 0 !important;
+    margin-left: 0 !important;
+    transform: none !important;
+}
+
+</style>

src/views/agent/payList.vue

@@ -757,7 +757,7 @@ export default {
 .pageheader-title h3 {
     display: flex;
     align-items: center;
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
     line-height: normal;
     letter-spacing: 0.08em;

src/views/agent/siteBaseSetting.vue

@@ -854,7 +854,7 @@ export default {
 }
 
 .pagetitle {
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
     line-height: normal;
     letter-spacing: 0.08em;

src/views/agent/siteList.vue

@@ -383,7 +383,7 @@ export default {
 }
 
 .pagetitle {
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
     line-height: normal;
     letter-spacing: 0.08em;

src/views/agent/siteMobileSetting.vue

@@ -577,7 +577,7 @@ export default {
 }
 
 .pagetitle {
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
     line-height: normal;
     letter-spacing: 0.08em;

src/views/agent/siteSemSetting.vue

@@ -542,7 +542,7 @@ export default {
 }
 
 .pagetitle {
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
     line-height: normal;
     letter-spacing: 0.08em;