Skip to content

M
marketing
Commit c6366f46 by caoyanzhi
Options

Merge branch 'bugfix/群发任务bug' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.dcc2984fce53977ba5e9c6bb446c7227.css
#	dist/static/js/card.a40cde4671cc3a8f6940.js
#	dist/static/js/ecm.86bc508ecba65bb75a04.js
#	dist/static/js/game.7a3b1f15b21de37203ca.js
#	dist/static/js/manifest.f3bec5fa6fa7821a8e1c.js
#	dist/static/js/message.7d604577d03f0cd9a582.js
#	package-lock.json
#	src/views/ecm/marketing-event/components/lib-teltask.vue
parents a6f40f7c b20de5a0
Showing with 14 additions and 4 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>GIC后台</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_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.dcc2984fce53977ba5e9c6bb446c7227.css rel=stylesheet></head><body><div id=app></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>GIC后台</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_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.067ea793fa97b52b2c30545b965e1ece.css rel=stylesheet></head><body><div id=app></div><script>(function() {
>>>>>>> bugfix/群发任务bug
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.6.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.64b69bfac57a92a09080.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.5ec4295eb151b0116365.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.6.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.64b69bfac57a92a09080.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.5ec4295eb151b0116365.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.6.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.f3bec5fa6fa7821a8e1c.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.5ec4295eb151b0116365.js></script></body></html>
>>>>>>> bugfix/群发任务bug
dist/static/css/main.067ea793fa97b52b2c30545b965e1ece.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.df42be0334090a471977.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.3f5aa2f4ae70cbd32c57.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.59f8a7ef78bc0d73daf2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.7f6636ae60d3eda39960.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ewash.2c2121ada4f3863521e4.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ewash.6cee7d43f8d40289f05b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.2dd731d1ff33fa990671.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.f3bec5fa6fa7821a8e1c.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"df42be0334090a471977",1:"2dd731d1ff33fa990671",2:"9cf200a6d8fb373f4c1d",3:"3f5aa2f4ae70cbd32c57",4:"9f19258faa4c519c56d1",5:"6cee7d43f8d40289f05b",6:"6145e7b924f480907aeb",7:"59f8a7ef78bc0d73daf2",8:"b8cf6a334acedc9272f4",9:"7df670599b2f4e2eb861",10:"abe49fffc2f372f23708",11:"5a996f4f6d9fab0ca84c",12:"091dd7723081a823098f",13:"e058d550c4872f50f70e",14:"2c3686115829ba023ea1"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/message.9f19258faa4c519c56d1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/scan.6145e7b924f480907aeb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/ecm/marketing-event/components/lib-qfxx.vue
......@@ -354,7 +354,8 @@ export default {
this.form.teltask = {
title: item.title,
content: item.content,
lateDays: item.lateDays
lateDays: item.lateDays,
invalidDay: item.invalidDay
};
this.form.telFlag = 1;
this.onChangeFailSetting(true);
......
src/views/ecm/marketing-event/components/lib-teltask.vue
......@@ -87,7 +87,7 @@ export default {
console.log(val);
if (val) {
console.log(val);
this.$emit('sendItem', this.form);
this.$emit('sendItem', JSON.parse(JSON.stringify(this.form)));
this.close();
}
});
......
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