Skip to content

M
member
Commit f62ab365 by huaying
Options

Merge branch 'feature/10月-我的客户' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/4.05853d6d29681342a3d8.js
#	dist/js/4.c5d8447f1585206b24aa.js
#	dist/js/4.e816265c1f03e423dc3f.js
#	dist/js/42.ca76463ee6951bff5b5d.js
#	dist/js/43.b1c299bc6a6f89b069c2.js
#	dist/js/55.c167452aa4127822480d.js
parents d156ea63 5c0c8410
Showing with 16 additions and 4 deletions
dist/css/app.b2155a68b31195c091fd16d241b20441.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.js></script><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.87de1b9720df6959029a3b2a57ed9186.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><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.js></script><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.b2155a68b31195c091fd16d241b20441.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() {
>>>>>>> feature/10月-我的客户
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 ? 'www.gicdev.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 type=text/javascript src=./js/manifest.d99da450bdf8ae4e4a74.js></script><script type=text/javascript src=./js/vendor.1f4c8e3f42763ca2f9f7.js></script><script type=text/javascript src=./js/app.5173f01303f8bb02ee43.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 type=text/javascript src=./js/manifest.d99da450bdf8ae4e4a74.js></script><script type=text/javascript src=./js/vendor.1f4c8e3f42763ca2f9f7.js></script><script type=text/javascript src=./js/app.5173f01303f8bb02ee43.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 type=text/javascript src=./js/manifest.08b9754abbb817e0aac2.js></script><script type=text/javascript src=./js/vendor.1f4c8e3f42763ca2f9f7.js></script><script type=text/javascript src=./js/app.348d111508870027aea9.js></script></body></html>
>>>>>>> feature/10月-我的客户
dist/js/1.8c100b65bddb88f81ab2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/app.348d111508870027aea9.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/manifest.08b9754abbb817e0aac2.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,u=0,i=[];u<c.length;u++)t=c[u],f[t]&&i.push(f[t][0]),f[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);i.length;)i.shift()();if(n)for(u=0;u<n.length;u++)o=b(b.s=n[u]);return o};var c={},f={78:0};function b(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,b){a=f[e]=[c,b]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"js/"+e+"."+{0:"07cb146e3cc05f8a506f",1:"8c100b65bddb88f81ab2",2:"1ad067f10ad50e9c4b71",3:"e517c4670f752d2049c9",4:"c5d8447f1585206b24aa",5:"aa8489425707bb42061a",6:"51b9a6003c22b02db305",7:"4a48d834a8334751c829",8:"b795c90be687628d78f3",9:"5ea55ed0bd1a88fd38ab",10:"ee9b5530520a9311232a",11:"94f03db489d75fec7945",12:"22898c946ca9f377d437",13:"de420df1c2b9a8046b73",14:"5e1b1bacaf461d3f20fc",15:"02d09171c81b9d839652",16:"5e534a4d30a5c89ef86d",17:"4c4a8fcdd9f5d5b43cb5",18:"656bfda750bd21ba1110",19:"339f4b3b2a0196e48cb2",20:"e456540bf5ada567f9ec",21:"6f6bbe2a223ec11660eb",22:"f0c4a83bb21b18e73925",23:"910bfcefb5472c33dff1",24:"adae3f21bc6ac638a6e4",25:"4194b0ce3512b3f90a0b",26:"ed12d539a6033e8874d4",27:"64aace9390081fd5c8cc",28:"7e2fcfc1c877179b16bb",29:"27944d9435ff8db40e05",30:"43a4c88c639dbabfebec",31:"d2e53ce8e0a7c0e3125d",32:"675d056548f4ba02258c",33:"3d01c5b7aacafd9c03ae",34:"e87bf6c5c93fc60eef52",35:"1cd7c0e488f5d9295225",36:"9f0d4457f20881f4e154",37:"929fb26e188ae58f4ac2",38:"8694af45d6fd6cb371c6",39:"f5f159023337cea682e9",40:"f79cf717bc2cf1ed3676",41:"d7a6498f85fad9dcbf69",42:"ca76463ee6951bff5b5d",43:"33da891afabbb8027c09",44:"116c855829dadb726059",45:"b982df3d51c78dc898d5",46:"c8012342892d41b713a5",47:"3d5bc75156091e718207",48:"93aa558e44d710df4f91",49:"89105a4ec7ba94789015",50:"77f3352c2c75708f6e8f",51:"7cf96ad2793415cf2387",52:"5593490f0502bda69324",53:"2f2de0c278e80b3db043",54:"a964d919cd1043441e5b",55:"70b2370b220b05bf0757",56:"27de620403f9d0d1363f",57:"de9cea7e014e484ea98f",58:"4ced35b64936f0147996",59:"1928ea2a1d254982e538",60:"f58b2745b7b3d40913f4",61:"bd732b46da067ee67672",62:"e97122171e8f7ad71fd5",63:"5ddb8eea7eabae4389f1",64:"4d65d5cf62d48a17425b",65:"8d9c5eee685da964ec92",66:"7e85be6451d48bb7c176",67:"3a452a03ffa07981126e",68:"44a59a6f2d76c8388040",69:"9d78445bb6272ce5e68a",70:"d680a4b5fb5e50984c0e",71:"df8e0bee4a86278221cf",72:"9420553525b49cf874b6",73:"c1bde2f348c20827d7bb",74:"5ab6bf7598b74fa3a2eb",75:"859aa00041abff0413b3"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/marketingRecord/components/ecm.vue
......@@ -73,14 +73,14 @@ export default {
},
ecmTypeList: [
{ label: '积分', value: 'integral' },
{ label: '短信', value: 'message' },
// { label: '短信', value: 'message' },
{ label: '话务', value: 'teltask' },
{ label: '群发任务', value: 'qfxx' },
{ label: '图文消息', value: 'teletext' },
{ label: '图片', value: 'image' },
{ label: '文本消息', value: 'text' },
{ label: '小程序', value: 'wxa' },
{ label: '卡券', value: 'card' }
// { label: '卡券', value: 'card' }
]
};
},
......
src/components/marketingRecord/index.vue
......@@ -285,6 +285,9 @@ export default {
background-color: #fff;
}
/deep/.el-tabs {
.el-tabs__header {
margin-left: 20px;
}
.el-tabs__header .el-tabs__nav-wrap{
/deep/.el-tabs__nav-scroll .el-tabs__nav .el-tabs__item:nth-child(2){
padding-left:20px ;
......
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