Browse Source

提交代码

zhuxinbo 5 years ago
parent
commit
fa55be6d33

+ 2 - 0
debug.log

@@ -3,3 +3,5 @@
 [0529/112937.608:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0619/110835.729:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0701/153438.192:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
+[0708/055752.148:ERROR:process_info.cc(375)] NtQuerySystemInformation SystemExtendedHandleInformation: {没有足够配额} 没有足够的虚拟内存或分页文件配额以完成指定的操作。 (0xc0000017)
+[0708/055807.088:ERROR:process_info.cc(359)] UncheckedAllocate

+ 16 - 0
src/components/layouts/TabLayout.vue

@@ -105,6 +105,22 @@
           let oldPositionRoute = this.pageList[oldIndex]
           this.pageList.splice(oldIndex, 1, Object.assign({}, newRoute, {meta: oldPositionRoute.meta}))
         }
+        if(!this.linkList.includes("/account/stepForm")){
+          localStorage.removeItem("step")
+          localStorage.removeItem("campaignId")
+          localStorage.removeItem("pans")
+        }
+        if(!this.linkList.includes("/account/advertisingGroup")){
+          localStorage.removeItem("advertisingGroup")
+          localStorage.removeItem("advertisingGroupKey")
+        }
+        if(!this.linkList.includes("/account/originality")){
+          localStorage.removeItem("originality")
+          localStorage.removeItem("originalityKey")
+        }
+        if(!this.linkList.includes("/account/accountIndex")){
+          localStorage.removeItem("accountId")
+        }
       },
       'activePage': function (key) {
         let index = this.linkList.lastIndexOf(key)

+ 16 - 14
src/views/modules/Statistics/components/Treeselect.vue

@@ -5,9 +5,10 @@
 </style>
 <template>
   <div class="select-project">
+      {{value}}
     <treeselect :multiple="multiple" :disable-branch-nodes="!multiple" :options="options" :load-options="loadOptions"
       placeholder="请选择项目以及账户" v-model="value" :value-consists-of="valueConsistsOf" :auto-load-root-options="false"
-      @select="update" @input="emitValue" :limit="2" :limitText="
+      @select="update" @input="emitValue" :limit="2"  :default-options="true" :limitText="
         count => {
           return '隐藏' + count + '条'
         }
@@ -71,23 +72,24 @@
     },
     watch: {
       $route(n, o) {},
-      appId: {
-        handler(n, o) {
-          // console.log(n)
-          if (n.length == 0) {
-            if (this.multiple) {
-              this.value = []
-            } else {
-              this.value = ''
-            }
-          }
-        },
-        deep: true
-      }
+    //   appId: {
+    //     handler(n, o) {
+    //       console.log(n)
+    //       if (n.length == 0) {
+    //         if (this.multiple) {
+    //           this.value = []
+    //         } else {
+    //           this.value = ''
+    //         }
+    //       }
+    //     },
+    //     deep: true
+    //   }
     },
     methods: {
       ...mapGetters(['nickname', 'avatar', 'userInfo']),
       update(node, id) {
+          console.log(node)
         getAction('/ctop/userAllocation/getAccountListByProjectId', {
           projectId: node.id
         }).then(res => {

+ 27 - 18
src/views/modules/kuaishouapp/account/accountIndex.vue

@@ -419,33 +419,37 @@
         this.$refs.copyGroup.handleSubmit(e)
       },
       toDetail(record) {
+
         localStorage.setItem('advertisingGroupKey', record.campaignId)
         localStorage.setItem('accountId', this.appId)
 
         getAction('/kuaishou/batch/getAsyncCreativeList', {
           campaignId: record.campaignId,
           accountId: this.appId
-        }).then()
-        if (localStorage.getItem('advertisingGroup')) {
-          var dataElse = JSON.parse(localStorage.getItem('advertisingGroup'))
-          console.log(dataElse)
-          for (let i = 0; i < dataElse.length; i++) {
-            if (dataElse[i].key == record.key) {
-              this.$router.replace({
-                path: '/account/advertisingGroup'
-              })
-              return
+        }).then(() => {
+          localStorage.setItem('campaignId', record.campaignId)
+          if (localStorage.getItem('advertisingGroup')) {
+            var dataElse = JSON.parse(localStorage.getItem('advertisingGroup'))
+            console.log(dataElse)
+            for (let i = 0; i < dataElse.length; i++) {
+              if (dataElse[i].key == record.key) {
+                this.$router.replace({
+                  path: '/account/advertisingGroup'
+                })
+                return
+              }
             }
+            dataElse.push(record)
+            localStorage.setItem('advertisingGroup', JSON.stringify(dataElse))
+          } else {
+            var data = [record]
+            localStorage.setItem('advertisingGroup', JSON.stringify(data))
           }
-          dataElse.push(record)
-          localStorage.setItem('advertisingGroup', JSON.stringify(dataElse))
-        } else {
-          var data = [record]
-          localStorage.setItem('advertisingGroup', JSON.stringify(data))
-        }
-        this.$router.replace({
-          path: '/account/advertisingGroup'
+          this.$router.replace({
+            path: '/account/advertisingGroup'
+          })
         })
+
       },
       setData(item) {
         let date = new Date()
@@ -722,6 +726,11 @@
     activated() {
       this.manyTwo = this.many
       this.$refs.treeSelect.getParticipateList()
+      if (this.appId == '') {
+        return
+      } else {
+        this.addUser()
+      }
     }
   }
 </script>

+ 12 - 1
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -793,6 +793,16 @@
       handleOk() {
         if (this.allForm.fail.length == 0) {
           this.remove(this.pansKey)
+          if (localStorage.getItem('originality')) {
+            this.$router.replace({
+              path: '/account/originality'
+            })
+          } else {
+            this.$router.replace({
+              path: '/account/accountIndex'
+            })
+          }
+
           this.visible = false
         } else {
           this.visible = false
@@ -1391,7 +1401,8 @@
           this.content = res.result
         })
         getAction('/kuaishou/batch/getActionBarText', {
-          campaignId: localStorage.getItem('campaignId')
+          campaignId: localStorage.getItem('campaignId') ? localStorage.getItem('campaignId') : localStorage
+            .getItem('advertisingGroupKey')
         }).then(res => {
           if (res.success) {
             this.appList = res.result

+ 127 - 0
src/views/modules/material/modules/videoList.vue

@@ -0,0 +1,127 @@
+<template>
+  <a-card :bordered="false">
+    <!-- table区域-begin -->
+    <div>
+      <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+        :pagination="false" :loading="loading">
+        <span slot="url" slot-scope="text">
+          <img :src="text+'?x-oss-process=video/snapshot,t_00000,m_fast'" style="width:200px" alt="">
+        </span>
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import JTreeSelect from '@/components/jeecg/JTreeSelect'
+  import {
+    httpAction,
+    getAction
+  } from '@/api/manage'
+  //   import {
+  //     JeecgListMixin
+  //   } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ProjectList',
+    // mixins: [JeecgListMixin],
+    components: {
+      JTreeSelect
+    },
+    props: {
+      dataSource: {
+        type: Array,
+        default () {
+          return []
+        }
+      },
+      ipagination: {
+        type: Object,
+        default () {
+          return {
+            current: 1,
+            pageSize: 10,
+            pageSizeOptions: ['10', '20', '30'],
+            showTotal: (total, range) => {
+              return range[0] + "-" + range[1] + " 共" + total + "条"
+            },
+            showQuickJumper: true,
+            // showSizeChanger: true,
+            total: 0
+          }
+        }
+      },
+      loading: {
+        type: Boolean,
+        default () {
+          return false
+        }
+      }
+    },
+    data() {
+      return {
+        description: '视频素材列表页',
+        // 表头
+        columns: [{
+            title: '项目名称',
+            align: 'center',
+            dataIndex: 'projectName'
+          },
+          {
+            title: '素材名称',
+            align: 'center',
+            dataIndex: 'materialName'
+          },
+          {
+            title: '素材',
+            align: 'center',
+            dataIndex: 'url',
+            scopedSlots: {
+              customRender: 'url'
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: {
+              customRender: 'action'
+            }
+          }
+        ],
+        url: {},
+        options: []
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+      }
+    },
+    methods: {
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+    },
+    mounted() {
+      getAction('/sys/user/getAllUserList', '').then(res => {
+        console.log(res)
+        if (res.success) {
+          this.options = res.result
+        }
+      })
+    },
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

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