朱鑫波 3 éve
szülő
commit
cd28ed7733
3 módosított fájl, 130 hozzáadás és 39 törlés
  1. 0 1
      package.json
  2. 5 5
      src/main.js
  3. 125 33
      src/views/modules/autoLaunchRevision/createLaunch.vue

+ 0 - 1
package.json

@@ -34,7 +34,6 @@
     "html2canvas": "^1.0.0-rc.3",
     "jquery": "^3.4.1",
     "js-cookie": "^2.2.0",
-    "k-form-design": "^3.6.1",
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "mcanvas": "^1.3.9",

+ 5 - 5
src/main.js

@@ -34,11 +34,11 @@ Vue.use(directive)
 Vue.use(filters)
 import md5 from 'blueimp-md5';
 
-// import KFormDesign from 'k-form-design'
-import KFormDesign from 'k-form-design/lib/k-form-design-mini.umd.min'
-import 'k-form-design/styles/k-form-design.less'
-// import 'k-form-design/lib/k-form-design.css'
-Vue.use(KFormDesign)
+// // import KFormDesign from 'k-form-design'
+// import KFormDesign from 'k-form-design/lib/k-form-design-mini.umd.min'
+// import 'k-form-design/styles/k-form-design.less'
+// // import 'k-form-design/lib/k-form-design.css'
+// Vue.use(KFormDesign)
 import 'ant-design-vue/dist/antd.less';
 import '@/styles/index.less'
 import VueLazyload from 'vue-lazyload'

+ 125 - 33
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -453,11 +453,16 @@ li.chouzhen.first:before {
                                         </a-descriptions-item>
 
                                         <a-descriptions-item label="是否使用渠道号">
-                                            {{ appDetail&&appDetail.useChannel ? '是' : '否' }}
+                                            {{ appDetail && appDetail.useChannel ? '是' : '否' }}
                                         </a-descriptions-item>
                                         <a-descriptions-item
                                             label="渠道号作用纬度"
-                                            v-if="appDetail&&appDetail.useChannel && channelData && channelData.channel.usageLevel"
+                                            v-if="
+                                                appDetail &&
+                                                    appDetail.useChannel &&
+                                                    channelData &&
+                                                    channelData.channel.usageLevel
+                                            "
                                         >
                                             {{
                                                 channelData.channel.usageLevel == 'account'
@@ -469,7 +474,12 @@ li.chouzhen.first:before {
                                         </a-descriptions-item>
                                         <a-descriptions-item
                                             label="是否使用单品"
-                                            v-if="appDetail&&appDetail.useChannel && channelData && channelData.channel.isHaveItem"
+                                            v-if="
+                                                appDetail &&
+                                                    appDetail.useChannel &&
+                                                    channelData &&
+                                                    channelData.channel.isHaveItem
+                                            "
                                         >
                                             {{ channelData.channel.isHaveItem == 1 ? '是' : '否' }}
                                         </a-descriptions-item>
@@ -500,18 +510,18 @@ li.chouzhen.first:before {
                                                     {{ !!item.tracUrl ? item.tracUrl : '-' }}
                                                 </a-descriptions-item>
                                                 <a-descriptions-item label="第三方actionBar监测链接" :span="3">
-                                                    {{ !!item.actionbarClickUrl ? item.actionbarClickUrl :'-' }}
+                                                    {{ !!item.actionbarClickUrl ? item.actionbarClickUrl : '-' }}
                                                 </a-descriptions-item>
                                             </a-descriptions>
                                         </a-collapse-panel>
                                     </a-collapse>
                                 </a-form-item>
                             </a-col>
-                            <a-col  :span="16" v-else>
+                            <a-col :span="16" v-else>
                                 <a-form-item :label="'应用' + (index + 1)" v-bind="formItemLayout">
                                     <p style="width:100%;display: flex;justify-content: space-between;">
-                                       {{item.appName}}({{item.appVersion}}) 
-                                        <a>详情</a>
+                                        {{ item.appName }}({{ item.appVersion }})
+                                        <a @click="lookChannel(item.appName)">详情</a>
                                     </p>
                                 </a-form-item>
                             </a-col>
@@ -1496,17 +1506,17 @@ li.chouzhen.first:before {
                                 :dataSource="multipleBidDataDrawer"
                                 :pagination="false"
                                 style="width:180%"
-                                :scroll="!useChannel?{ x: 1200 }:{ x: true }"
+                                :scroll="!useChannel ? { x: 1200 } : { x: true }"
                             >
                                 <a-table-column
                                     key="appName"
-                                    :width="!useChannel?'10%':true"
+                                    :width="!useChannel ? '10%' : true"
                                     data-index="appName"
                                     title="应用名称"
                                     align="center"
                                 />
                                 <a-table-column
-                                    :width="!useChannel?'10%':true"
+                                    :width="!useChannel ? '10%' : true"
                                     key="appVersion"
                                     data-index="appVersion"
                                     title="应用标记"
@@ -1679,22 +1689,41 @@ li.chouzhen.first:before {
         >
             <!-- @close="closeUnit('createForm')" -->
             <h2 slot="title" style="margin-bottom: 0">定向包选择</h2>
-            <div style="display: flex">
-                <a-input placeholder="输入定向包名称关键词" style="width:60%" v-model="searchTemplate" />
-                <a-button type="primary" :style="{ marginRight: '8px', marginLeft: '8px' }" @click="getTargetPerson()">
-                    查询
-                </a-button>
-                <a-button
-                    @click="
-                        searchTemplate = null
-                        ipagination.current = 1
-                        checkPerson = checkPersonElse
-                        getTargetPerson()
-                    "
-                >
-                    重置
-                </a-button>
-                <div style="line-height: 32px;font-weight: 700;margin-left: 50px;">已选择({{ sumContent }})</div>
+            <div style="display: flex;justify-content:space-between">
+                <div>
+                    <a-input placeholder="输入定向包名称关键词" style="width:50%" v-model="searchTemplate" />
+                    <a-button
+                        type="primary"
+                        :style="{ marginRight: '8px', marginLeft: '8px' }"
+                        @click="getTargetPerson()"
+                    >
+                        查询
+                    </a-button>
+                    <a-button
+                        @click="
+                            searchTemplate = null
+                            ipagination.current = 1
+                            checkPerson = checkPersonElse
+                            getTargetPerson()
+                        "
+                    >
+                        重置
+                    </a-button>
+                </div>
+                <div style="display:flex">
+                    <div style="line-height: 32px;font-weight: 700;margin:0 20px;">已选择({{ sumContent }})</div>
+                    <a-button
+                        type="primary"
+                        @click="
+                            searchTemplate = null
+                            ipagination.current = 1
+                            checkPerson = checkPersonElse
+                            getTargetPerson()
+                        "
+                    >
+                        新增定向包
+                    </a-button>
+                </div>
             </div>
             <a-checkbox-group v-model="checkPerson" style="width: 100%;" @change="setVideoData">
                 <div class="card-person-drawer info-detail">
@@ -2321,6 +2350,22 @@ li.chouzhen.first:before {
                 </a-select>
             </a-form-item>
         </a-modal>
+        <a-modal v-model="lookChannelVisible" :footer="null" :width="1000">
+            <a-table
+                :columns="TTcolumns"
+                :dataSource="lookChannelList"
+                :pagination="lookChannelIpagination"
+                :loading="lookChannelLoading"
+                bordered
+                size="middle"
+                style="word-break: break-all;font-size:16px;font-weight:600"
+                id="outTable"
+                ref="accountTable"
+                rowKey="id"
+                :scroll="{ x: 1500 }"
+            >
+            </a-table>
+        </a-modal>
     </div>
 </template>
 
@@ -2360,6 +2405,47 @@ let optionsAppActive = []
 let businessOptions = []
 let fansStarOptions = []
 let interestVideoOptions = []
+let TTcolumns = [
+    {
+        title: '渠道号名称',
+        dataIndex: 'channelName',
+        scopedSlots: { customRender: 'channelName' },
+        align: 'center',
+        key: 'channelName'
+    },
+    {
+        title: '下载链接',
+        dataIndex: 'url',
+        scopedSlots: { customRender: 'url' },
+        align: 'center',
+        key: 'url',
+        width: 300
+    },
+    {
+        title: '调起链接',
+        dataIndex: 'schemaUri',
+        scopedSlots: { customRender: 'schemaUri' },
+        align: 'center',
+        key: 'schemaUri',
+        width: 300
+    },
+    {
+        title: '第三方点击监测链接',
+        dataIndex: 'clickTrackUrl',
+        scopedSlots: { customRender: 'clickTrackUrl' },
+        align: 'center',
+        key: 'clickTrackUrl',
+        width: 300
+    },
+    {
+        title: '第三方actionBar监测链接',
+        dataIndex: 'actionbarClickUrl',
+        scopedSlots: { customRender: 'actionbarClickUrl' },
+        align: 'center',
+        key: 'actionbarClickUrl',
+        width: 300
+    }
+]
 export default {
     name: 'GlobalHeader',
     components: {
@@ -2431,8 +2517,11 @@ export default {
             convertList: [],
             convertType: '1',
             convert: false,
-            lookChannelVisible:false,
-            lookChannelList:[],
+            TTcolumns,
+            lookChannelVisible: false,
+            lookChannelAppName: '',
+            lookChannelList: [],
+            lookChannelLoading: false,
             lookChannelIpagination: {
                 current: 1,
                 pageSize: 10,
@@ -2449,6 +2538,7 @@ export default {
                     // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
                     this.lookChannelIpagination.current = current
                     this.lookChannelIpagination.pageSize = pageSize
+                    this.lookChannel(this.lookChannelAppName)
                 }
             },
 
@@ -3411,7 +3501,7 @@ export default {
             this.formTargetApp.validateFields((err, values) => {
                 //console.log(values)
                 if (!err) {
-                    this.appDetailMiddle = JSON.parse(JSON.stringify({...values,useChannel:this.useChannel}))
+                    this.appDetailMiddle = JSON.parse(JSON.stringify({ ...values, useChannel: this.useChannel }))
                     this.appDetail = JSON.parse(JSON.stringify(this.appDetailMiddle))
                     this.multipleBidData = JSON.parse(JSON.stringify(this.multipleBidDataDrawer))
                     this.targetAppVisible = false
@@ -3564,16 +3654,18 @@ export default {
                 }
             }
         },
-        lookChannel(appName){
+        lookChannel(appName) {
             this.lookChannelVisible = true
+            this.lookChannelLoading = true
+            this.lookChannelAppName = appName
             var params = {}
             params.accountId = this.getFormData('formProject', 'accountId')
             params.appName = appName
             params.pageNo = this.lookChannelIpagination.current
             params.pageSize = this.lookChannelIpagination.pageSize
-            this.getAction('/channel/queryChannelList', params).then(res=>{
-                this.lookChannelVisible = false
-                if(res.success){
+            this.getAction('/channel/queryChannelList', params).then(res => {
+                this.lookChannelLoading = false
+                if (res.success) {
                     this.lookChannelList = res.result.list || []
                     this.lookChannelIpagination.total = res.result.total || 0
                 }