Sfoglia il codice sorgente

Merge branch 'test'

syh 5 anni fa
parent
commit
c916869c69

BIN
dist.zip


+ 1 - 1
src/mixins/JeecgListMixin.js

@@ -148,7 +148,7 @@ export const JeecgListMixin = {
         this.queryParam.createTime = this.editDate(this.queryParam.createTime)
       }
       var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
-      param.field = this.getQueryField();
+    //   param.field = this.getQueryField();
       param.pageNo = this.ipagination.current;
       param.pageSize = this.ipagination.pageSize;
       return filterObj(param);

+ 40 - 7
src/views/404.vue

@@ -1,15 +1,48 @@
 <template>
   <div>
-    404 page
+    404 page 
+    agreement n. 协定;协议;契约;(意见或看法)一致;应允;同意
+    alliance n.(国家、政党等的)结盟,同盟;结盟团体;联盟
+    allies n.(尤指战时的)同盟国;(尤指从政者的)盟友,支持者;(第一次世界大战中的)协约国;(第二次世界大战中的)同盟国
+            v.与…结盟
+    ambassador n.大使;使节
+    amendment n.(法律、文件的)改动,修正案,修改,修订;(美国宪法的)修正案
+    press n.报章杂志;报刊;印刷媒体;记者;新闻工作者;新闻界;报道;评论
+            v.(被)压,挤,推,施加压力;按,压(使启动);将…塞进;把…按入
+    conference n.(通常持续几天的大型正式)会议,研讨会;(正式)讨论会,商讨会;体育协会(或联合会)
+    cabinet n.内阁;储藏柜;陈列柜
+    campaign n.运动(为社会、商业或政治目的而进行的一系列有计划的活动);战役
+            v.参加运动,领导运动(如为实现政治变革或赢得竞选胜利)
+    elect v.选举;推选;选择,决定(做某事)
+            adj.(用于名词后)当选而尚未就职的,候任的;上帝的选民
+            n.被选的人
+    shoe-string 鞋带
+    majority  n.大部分;大多数;(获胜的)票数;多数票;超出其余各方票数总和的票数
+    bare adj.裸体的;裸露的;(树木)光秃秃的;(土地)荒芜的;无遮盖的;没有保护的
+         v.揭开;脱掉(衣服)
+    majority n.大部分;大多数;(获胜的)票数;多数票;超出其余各方票数总和的票数
+    absolute adj.完全的;全部的;绝对的;(英语口语中尤用以强调)道地的,确实的,十足的;肯定的;无疑的;明确的
+            n.绝对真理(指思想或原理)
+    majority n.大部分;大多数;(获胜的)票数;多数票;超出其余各方票数总和的票数
+    abstain from  不参加;投弃权票;不说;没有
+    voting n.投票;选举;表决
+            v.投票(赞成 / 反对);表决(支持 / 不支持);选举;选出,推举(某人担任某职);表决(授奖给某人);表明,认为,公认(某事好或坏)
+            vote的现在分词
+    cast one’s ballot 投票选举; 投票表决; 选票; 投票总数; 要求某人无记名投票; 进行无记名投票
+
+
+
+    Extremist   militant  invade 
+aggression          terrorist  evacuate 
+compromise          military coupe 
+armed conflict
   </div>
 </template>
 
 <script>
-  export default {
-    name: "404"
-  }
+export default {
+  name: '404'
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

+ 17 - 1
src/views/modules/advertiser/ProjectMemberList.vue

@@ -147,6 +147,19 @@
           </a-radio-group>
         </a-form-item>
         <a-form-item
+          label="系统类型:"
+          :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
+          :wrapper-col="{ xs: { span: 24 }, sm: { span: 16 } }"
+        >
+          <a-radio-group buttonStyle="outline" v-model="systemType">
+            <a-radio-button value="不限">不限</a-radio-button>
+            <a-radio-button value="IOS">IOS</a-radio-button>
+            <a-radio-button value="安卓">安卓</a-radio-button>
+            <a-radio-button value="4">其他</a-radio-button>
+          </a-radio-group>
+          <a-input v-model="systemTypeName" v-if="systemType == '4'" placeholder="请输入系统类型" />
+        </a-form-item>
+        <a-form-item
           label="预警金额"
           :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
           :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }"
@@ -232,6 +245,8 @@ export default {
       loginType: 'kuaishou',
       form: this.$form.createForm(this),
       record: '',
+      systemType: '不限',
+      systemTypeName: '',
       queryParam: {
         projectId: '',
         userId: ''
@@ -516,6 +531,7 @@ export default {
     onChageLogin() {
       console.log(this.mode)
       this.loginType = 'kuaishou'
+      this.systemType = '不限'
     },
     handleSubmit() {
       let params = {}
@@ -525,7 +541,7 @@ export default {
       params.userName = this.userInfo().realname
       params.projectId = this.record.projectId
       params.projectName = this.record.projectName
-
+      params.systemType = this.systemType == '4' ? this.systemTypeName : this.systemType
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {

+ 138 - 133
src/views/modules/agent/KuaishouAgentAccountList.vue

@@ -1,11 +1,9 @@
 <template>
   <a-card :bordered="false">
-
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="24">
-
           <a-col :md="6" :sm="8">
             <a-form-item label="广告主ID">
               <a-input placeholder="请输入广告主ID" v-model="queryParam.id"></a-input>
@@ -21,7 +19,16 @@
               <a-input placeholder="请输入公司名称" v-model="queryParam.corporationName"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8" >
+          <a-col :md="6" :sm="8">
+            <a-form-item label="审核状态">
+              <a-select v-model="queryParam.reviewStatus">
+                <a-select-option :value="1">审核中</a-select-option>
+                <a-select-option :value="2">审核通过</a-select-option>
+                <a-select-option :value="3">审核拒绝</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -38,7 +45,6 @@
 
     <!-- table区域-begin -->
     <div>
-
       <a-table
         ref="table"
         size="middle"
@@ -48,8 +54,8 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -57,138 +63,137 @@
 </template>
 
 <script>
-  import KuaishouAgentAccountModal from './modules/KuaishouAgentAccountModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import KuaishouAgentAccountModal from './modules/KuaishouAgentAccountModal'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
-  export default {
-    name: "KuaishouAgentAccountList",
-    mixins:[JeecgListMixin],
-    components: {
-      KuaishouAgentAccountModal
-    },
-    data () {
-      return {
-        description: '快手代理商账户表管理页面',
-        // 表头
-        columns: [
-		   {
-            title: '广告主ID',
-            align:"center",
-            dataIndex: 'accountId',
-          },
-          {
-            title: '用户ID',
-            align:"center",
-            dataIndex: 'userId'
-          },
-		   {
-            title: '广告主名称',
-            align:"center",
-            dataIndex: 'accountName'
-           },
-		   {
-            title: '现金余额',
-            align:"center",
-            dataIndex: 'balance'
-           },
-		   {
-            title: '信用余额',
-            align:"center",
-            dataIndex: 'creditBalance'
-           },
-		   // {
-       //      title: 'extendedBalance',
-       //      align:"center",
-       //      dataIndex: 'extendedBalance'
-       //     },
-		   {
-            title: '返点余额',
-            align:"center",
-            dataIndex: 'rebate'
-           },
-		   // {
-       //      title: 'preRebate',
-       //      align:"center",
-       //      dataIndex: 'preRebate'
-       //     },
-		   {
-            title: '框返余额',
-            align:"center",
-            dataIndex: 'contractRebate'
-           },
-		   {
-            title: '激励余额',
-            align:"center",
-            dataIndex: 'directRebate'
-           },
-		   {
-            title: '总余额',
-            align:"center",
-            dataIndex: 'totalBalance'
-           },
-		   // {
-       //      title: 'kuaibiBalance',
-       //      align:"center",
-       //      dataIndex: 'kuaibiBalance'
-       //     },
-		   // {
-       //      title: 'pushBalance',
-       //      align:"center",
-       //      dataIndex: 'pushBalance'
-       //     },
-		   // {
-       //      title: 'recharged',
-       //      align:"center",
-       //      dataIndex: 'recharged'
-       //     },
-		   {
-            title: '公司名称',
-            align:"center",
-            dataIndex: 'corporationName'
-           },
-		   {
-            title: '审核状态',
-            align:"center",
-            dataIndex: 'reviewStatus',
-             customRender: (text, row, index) => {
-               if (text == 1) { // 前4行数据以a标签的形式被渲染
-                 return '审核中'
-               }else if(text == 2){
-                 return '审核通过'
-               }else if(text == 3){
-                 return '审核拒绝';
-               }
-             }
-           },
-		   // {
-       //      title: 'frozenStatus',
-       //      align:"center",
-       //      dataIndex: 'frozenStatus'
-       //     },
-		   // {
-       //      title: 'transferAccountStatus',
-       //      align:"center",
-       //      dataIndex: 'transferAccountStatus'
-       //     },
-        ],
-		url: {
-          list: "/kuaishou/kuaishouAgentAccount/list",
-          delete: "/kuaishou/kuaishouAgentAccount/delete",
-          deleteBatch: "/kuaishou/kuaishouAgentAccount/deleteBatch",
-          exportXlsUrl: "kuaishou/kuaishouAgentAccount/exportXls",
-       },
+export default {
+  name: 'KuaishouAgentAccountList',
+  mixins: [JeecgListMixin],
+  components: {
+    KuaishouAgentAccountModal
+  },
+  data() {
+    return {
+      description: '快手代理商账户表管理页面',
+      // 表头
+      columns: [
+        {
+          title: '广告主ID',
+          align: 'center',
+          dataIndex: 'accountId'
+        },
+        {
+          title: '用户ID',
+          align: 'center',
+          dataIndex: 'userId'
+        },
+        {
+          title: '广告主名称',
+          align: 'center',
+          dataIndex: 'accountName'
+        },
+        {
+          title: '现金余额',
+          align: 'center',
+          dataIndex: 'balance'
+        },
+        {
+          title: '信用余额',
+          align: 'center',
+          dataIndex: 'creditBalance'
+        },
+        // {
+        //      title: 'extendedBalance',
+        //      align:"center",
+        //      dataIndex: 'extendedBalance'
+        //     },
+        {
+          title: '返点余额',
+          align: 'center',
+          dataIndex: 'rebate'
+        },
+        // {
+        //      title: 'preRebate',
+        //      align:"center",
+        //      dataIndex: 'preRebate'
+        //     },
+        {
+          title: '框返余额',
+          align: 'center',
+          dataIndex: 'contractRebate'
+        },
+        {
+          title: '激励余额',
+          align: 'center',
+          dataIndex: 'directRebate'
+        },
+        {
+          title: '总余额',
+          align: 'center',
+          dataIndex: 'totalBalance'
+        },
+        // {
+        //      title: 'kuaibiBalance',
+        //      align:"center",
+        //      dataIndex: 'kuaibiBalance'
+        //     },
+        // {
+        //      title: 'pushBalance',
+        //      align:"center",
+        //      dataIndex: 'pushBalance'
+        //     },
+        // {
+        //      title: 'recharged',
+        //      align:"center",
+        //      dataIndex: 'recharged'
+        //     },
+        {
+          title: '公司名称',
+          align: 'center',
+          dataIndex: 'corporationName'
+        },
+        {
+          title: '审核状态',
+          align: 'center',
+          dataIndex: 'reviewStatus',
+          customRender: (text, row, index) => {
+            if (text == 1) {
+              // 前4行数据以a标签的形式被渲染
+              return '审核中'
+            } else if (text == 2) {
+              return '审核通过'
+            } else if (text == 3) {
+              return '审核拒绝'
+            }
+          }
+        }
+        // {
+        //      title: 'frozenStatus',
+        //      align:"center",
+        //      dataIndex: 'frozenStatus'
+        //     },
+        // {
+        //      title: 'transferAccountStatus',
+        //      align:"center",
+        //      dataIndex: 'transferAccountStatus'
+        //     },
+      ],
+      url: {
+        list: '/kuaishou/kuaishouAgentAccount/list',
+        delete: '/kuaishou/kuaishouAgentAccount/delete',
+        deleteBatch: '/kuaishou/kuaishouAgentAccount/deleteBatch',
+        exportXlsUrl: 'kuaishou/kuaishouAgentAccount/exportXls'
+      }
     }
   },
   computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     }
   },
-    methods: {
-     
-    }
-  }
+  methods: {}
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
-</style>
+@import '~@assets/less/common.less';
+</style>

File diff suppressed because it is too large
+ 423 - 1159
src/views/modules/material/scriptMaterial.vue


File diff suppressed because it is too large
+ 1178 - 996
src/views/modules/material/videoMaterial.vue


+ 2 - 2
vue.config.js

@@ -65,13 +65,13 @@ module.exports = {
        },*/
       '/jeecg-boot': {
         // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
-        // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
+        target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.143:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.2.110:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目  孙震
-        target:'http://127.0.0.1:8080',
+        // target:'http://127.0.0.1:8080',
         ws: false,
         changeOrigin: true
       },