Skip to content

M
marketing
Commit 540ba572 by caoyanzhi
Options

Merge branch 'bugfix/链接小工具优化' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.d3b11c022e1b3d855b96e47a45683ee6.css
#	dist/static/js/16.1706f6b7ba51a605c0f4.js
#	dist/static/js/16.91803d84dca88eb2778e.js
#	dist/static/js/16.af6668727d5f49b06d0e.js
parents b4013301 634e861b
Showing with 35 additions and 17 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_3229694_f4zx0uhc8y.css><script src=//at.alicdn.com/t/font_3229694_f4zx0uhc8y.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_1d7th3zc6it.css><script src=//at.alicdn.com/t/font_2996579_1d7th3zc6it.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link href=/marketing/static/css/main.9d5c63711008d90359d7dd67c1e0b335.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.css><script src=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_875h3lycepk.css><script src=//at.alicdn.com/t/font_2996579_875h3lycepk.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link href=/marketing/static/css/main.d3b11c022e1b3d855b96e47a45683ee6.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> bugfix/链接小工具优化
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.b99d52946f4dbebadcd9.js></script><script type=text/javascript src=/marketing/static/js/vendor.f17f3d28b64b648f6606.js></script><script type=text/javascript src=/marketing/static/js/main.5f3150f6cd8fa6cc9630.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.b99d52946f4dbebadcd9.js></script><script type=text/javascript src=/marketing/static/js/vendor.f17f3d28b64b648f6606.js></script><script type=text/javascript src=/marketing/static/js/main.5f3150f6cd8fa6cc9630.js></script></body></html>
=======
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.a67cb723ee31df4063ab.js></script><script type=text/javascript src=/marketing/static/js/vendor.01ae7be260c6c1f9c444.js></script><script type=text/javascript src=/marketing/static/js/main.79ffc5c68fa674ba3326.js></script></body></html>
>>>>>>> bugfix/链接小工具优化
dist/static/css/main.d3b11c022e1b3d855b96e47a45683ee6.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/14.4e93bd8180affb620102.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.91803d84dca88eb2778e.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.af6668727d5f49b06d0e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.a67cb723ee31df4063ab.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,o){for(var f,d,i,u=0,s=[];u<c.length;u++)d=c[u],n[d]&&s.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(a&&a(c,t,o);s.length;)s.shift()();if(o)for(u=0;u<o.length;u++)i=r(r.s=o[u]);return i};var c={},n={24:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",15:"calllog"}[e]||e)+"."+{0:"984fabe7f7c87bd073c9",1:"08e74c9cef1a59a62ace",2:"d8053211a1062cf0e580",3:"61e1d1a00a605488f348",4:"0ed5feeccec606921a9e",5:"dd66a6012402ab8d374f",6:"118cffd4fc4aec6165ca",7:"1870a11c1c7a62882285",8:"388da8ce361aad466b33",9:"fe11d8b6fea8a8e19249",10:"6750cbc0a759ff4c6458",11:"204e0fccedfb8f4e13ed",12:"6bfc17dc974fc1d49fbb",13:"fcdcee9f6a8e702a7712",14:"4e93bd8180affb620102",15:"cf0b09aa556f363809e3",16:"af6668727d5f49b06d0e",17:"545fa0f7d9e15b5d8fd4",18:"cba6d1e72fada0526c41",19:"33a19eb0bb9415568c66",20:"66d6821411e0e42afe9e",21:"3b70c426e7cb5384d238"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="/marketing/",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/linktools-fulls/index.vue
......@@ -58,7 +58,7 @@ components: {linkId
<!-- 滚动加载更多 -->
<!-- 二级下拉 -->
<el-select v-model="twoLevelValue" v-loadmore="getMore" class="w200" placeholder="请选择" v-if="twoLevelVisible" @change="twoLevelValueChange">
<el-select v-model="twoLevelValue" class="w200" placeholder="请选择" v-if="twoLevelVisible" @change="twoLevelValueChange">
<el-option
v-for="item in twoLevelOptions"
:key="item.value"
......@@ -1332,7 +1332,8 @@ export default {
const para = {
pageType: 1,
status: 1,
pageSize: 50,
pageSize: 9999,
sortType: 2,
currentPage: this.definePageCurrent,
requestProject: this.repProjectName
}
......
src/views/popup/form.vue
......@@ -131,7 +131,7 @@
<el-select class="select-page" v-model="putonForm.id" placeholder="请选择投放页面" @change="putonPageChange">
<el-option v-for="page in putonPageList" :label="page.name" :value="page.id" :key="page.id"></el-option>
</el-select>
<el-select class="select-page" v-if="putonForm && putonForm.type == 6" v-model="putonForm.customPageId" placeholder="请选择投放页面">
<el-select class="select-page" v-if="putonForm && putonForm.type == 6" v-model="putonForm.customPageId" placeholder="请选择投放页面（可根据页面名称搜索）" filterable remote :remote-method="getPageList">
<el-option v-for="page in customPageList" :label="page.title" :value="page.pageId" :key="page.pageId"></el-option>
</el-select>
<div slot="footer" class="dialog-footer">
......@@ -354,6 +354,25 @@ export default {
this.getPopupLinkList();
},
methods: {
getPageList(query) {
const params = {
pageType: 1,
status: 1,
sortType: 2,
pageSize: 9999,
currentPage: 1,
title: query,
requestProject: 'gic-web'
};
this.customPageList = [];
customPageList(params).then(res => {
const { errorCode, result } = res || { result: {} };
if (errorCode != 0) return;
if (Array.isArray(result.result)) {
this.customPageList = result.result;
}
});
},
async getDetail() {
const res = await getPopupPlan({ popupPlanId: this.$route.query.id });
if (res.errorCode === 0 && res.result) {
......@@ -553,18 +572,7 @@ export default {
this.putonPageList = res.data.result;
}
});
const params = {
pageType: 1,
status: 1,
pageSize: 500,
currentPage: 1,
requestProject: 'gic-web'
};
customPageList(params).then(res => {
if (res.errorCode == 0) {
this.customPageList = res.result.result || [];
}
});
this.getPageList();
},
putonPageChange(pageId) {
const page = this.putonPageList.filter(item => item.id == pageId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment