Skip to content

M
marketing
Commit c16bac8c by caoyanzhi
Options

Merge branch 'bugfix/短信营销模板库' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.b05b32a1085bbc7b79c7c5a16db2584a.css
#	dist/static/css/main.bdc0b828b6a6d7ef76fc4e22493cd74f.css
#	dist/static/js/card.59919e1dd909b554d418.js
#	dist/static/js/card.b86a622584b59fae7a96.js
#	dist/static/js/card.f44fda034a77bb3a0abb.js
#	dist/static/js/ecm.05502f1a7fe72c880d45.js
#	dist/static/js/ecm.2e3aff3555c039eb2507.js
#	dist/static/js/ecm.ecc8d90767737556b435.js
#	dist/static/js/evaluation.1a27de8282c8acca16a9.js
#	dist/static/js/evaluation.a5b854bbbee63abccbb4.js
#	dist/static/js/evaluation.d218fe24b42b81fa0acf.js
#	dist/static/js/scan.5f1cbddbaf62018c6b9e.js
#	dist/static/js/wechat.eb611311708717c5ca6f.js
#	src/views/ai/task/task.vue
parents f3309903 eef1808c
Showing with 12 additions and 3 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/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css><script src=//at.alicdn.com/t/font_3229694_yzk6z4765g.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link href=/marketing/static/css/main.b05b32a1085bbc7b79c7c5a16db2584a.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/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_3229694_f4zx0uhc8y.css><script src=//at.alicdn.com/t/font_3229694_f4zx0uhc8y.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link href=/marketing/static/css/main.bdc0b828b6a6d7ef76fc4e22493cd74f.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 ? '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 src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.55508f2d94a646afb5a4.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.956ae8a13421f177409c.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.55508f2d94a646afb5a4.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.956ae8a13421f177409c.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 type=text/javascript src=/marketing/static/js/manifest.5b516489f6183463ed6c.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.f4253c7a6c3187f30a9b.js></script></body></html>
>>>>>>> bugfix/短信营销模板库
dist/static/css/main.bdc0b828b6a6d7ef76fc4e22493cd74f.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.59919e1dd909b554d418.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.f44fda034a77bb3a0abb.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.2e3aff3555c039eb2507.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.ecc8d90767737556b435.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.a5b854bbbee63abccbb4.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.d218fe24b42b81fa0acf.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.5b516489f6183463ed6c.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,o){for(var b,f,d,i=0,u=[];i<c.length;i++)f=c[i],n[f]&&u.push(n[f][0]),n[f]=0;for(b in t)Object.prototype.hasOwnProperty.call(t,b)&&(e[b]=t[b]);for(a&&a(c,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)d=r(r.s=o[i]);return d};var c={},n={25: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:"f44fda034a77bb3a0abb",1:"fe1f48c1d23381a2afab",2:"eb611311708717c5ca6f",3:"ecc8d90767737556b435",4:"ccc5769085bebc802cbd",5:"feb0ffd2cfb795f0d746",6:"5f1cbddbaf62018c6b9e",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"e6f1eb3edd0d67e0733b",10:"a5b854bbbee63abccbb4",11:"b3c01b56cf6bb230b455",12:"2cc9afcdab04796a1278",13:"0da42538485540d84757",14:"bda20ad51b5860401314",15:"d9311e9aefc4261c6843",16:"bea1e19a292b8b599704",17:"cc12e35ea94e31a7caa8",18:"fdc377d2e375560439b8",19:"be3e71923d339e38ace9",20:"bc68fb59d5a3191a267b",21:"3b70c426e7cb5384d238",22:"67ff09408b92aef14903"}[e]+".js";var b=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(b);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=f,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
dist/static/js/message.ccc5769085bebc802cbd.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.5f1cbddbaf62018c6b9e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.eb611311708717c5ca6f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/message/temp.vue
......@@ -45,7 +45,7 @@
</el-row>
<div class="text-center" v-if="smsTempList.length === 0">
<img class="block block-center pt100" width="60" height="60" src="../../assets/img/no-data_icon.png" alt="" />
<el-button class="block block-center mt10" type="text" @click="$router.push('/message/temp/add')">新建短信模板</el-button>
<el-button class="block block-center mt10" type="text" v-if="$getButtonLimit($buttonCode.marketingTempAdd)" :limit-code="$buttonCode.marketingTempAdd" @click="addTemp">新建短信模板</el-button>
</div>
<del-dialog :dialogVisible.sync="dialogVisible" :list="delList" />
<dm-pagination v-show="smsTempList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
......
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