Skip to content

M
marketing
Commit 38267a2c by Jings
Options

fix: 解决冲突

parents 00be00c4 9a456e2d
Showing with 14 additions and 5 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 rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link rel=stylesheet href=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css><script src=//at.alicdn.com/t/c/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 rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.css><script src=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.js></script><link href=/marketing/static/css/main.2034e81c0831f5bafe469898f4667952.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/c/font_3380872_b9qubgdi1ic.css><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 rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.css><script src=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.js></script><link href=/marketing/static/css/main.4552db0697836f06effbf0e085908f2b.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() {
>>>>>>> origin/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.f265bfcdf209fa566a71.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.e2d557656f10c681160f.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.f265bfcdf209fa566a71.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.e2d557656f10c681160f.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.1dd80711dc3ca5194b27.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.7f6485dc40fdadf8d0ef.js></script></body></html>
>>>>>>> origin/bugfix/卡券模板提示文案修改
dist/static/css/main.2034e81c0831f5bafe469898f4667952.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.4552db0697836f06effbf0e085908f2b.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.fb90877515ad0d861a80.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.093c2cbb5df5215f88fb.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.76e494e353d5fc70a400.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.4bc2eebf35f1626d9ded.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.1dd80711dc3ca5194b27.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],c[d]&&u.push(c[d][0]),c[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},c={25:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.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:"fb90877515ad0d861a80",1:"4bc2eebf35f1626d9ded",2:"78a893a3285592901952",3:"093c2cbb5df5215f88fb",4:"6dd91b070750fcfb3236",5:"1ff85c307f9e68524f34",6:"9015a4ca7e6cbbe79512",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"e7d2878583540df0ada7",10:"0756ab734cd7ddc9e1b3",11:"b546fc16c681ec46a784",12:"cfc3f8be1c43035ac2fc",13:"fe49d25bfd31478e9cc8",14:"f76cb123b63cbe00b3b5",15:"7e607494d8968aef74ab",16:"0da77f92b8d1ab2e6dff",17:"6b3ebc28621b084bd224",18:"759a98067ceda319dbac",19:"ffdbfa6a1416f79f5183",20:"586426db4db60db953da",21:"3b70c426e7cb5384d238",22:"6cd16237471f80ad3676"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/marketing/",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/message.6dd91b070750fcfb3236.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.4ce8a21b87223c7d3c64.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.fe49d25bfd31478e9cc8.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/popup.cfc3f8be1c43035ac2fc.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.9015a4ca7e6cbbe79512.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/card/partials/card-item.vue
......@@ -6,7 +6,7 @@
<div style="max-width: 300px" slot="content">{{ item.gicCouponType | getTipText }}</div>
<span class="card-item_head-tip">外部券<i class="iconfont icon-xinxixianshi card-item_head-icon"></i></span>
</el-tooltip>
<h4 style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;padding: 0 20px;">{{ item.cardName }}</h4>
<h4 style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden; padding: 0 20px">{{ item.cardName }}</h4>
<p>{{ item.subName }}</p>
</div>
<div class="card-item_body">
......@@ -36,9 +36,9 @@
<el-tooltip class="item" effect="dark" open-delay="300">
<div slot="content">
<span v-if="item.isApiCreate">该卡券为外部接口创建卡券无法用于营销</span>
<span v-else> 1.卡券的领取数据\使用数量\核销率\销售额统计每天9：30/12：30/15：30/18：30各刷新一次数据；<br />2.销售额：此卡券参与核销的订单应收总金额（若订单发送退款且退券则金额扣除，不退券则金额不扣除）。一笔订单若使用多张相同卡券，只计一笔订单的金额</span>
<span v-else> 1.卡券的领取数据\使用量\核销率\销售统计额每天9:30/12;30/15;30/18:30点后开始各刷新一次数据，视数量大小，正常情况下执行开始后1小时左右可完成数据刷新。如12点30刷新数据，在13点30可查看到9点30到12点30新增领取等数据<br />2.销售额：此卡券参与核销的订单应收总金额（若订单发送退款且退券则金额扣除，不退券则金额不扣除）。一笔订单若使用多张相同卡券，只计一笔订单的金额</span>
</div>
<i style="position:absolute;right:10px;top:10px;cursor:pointer;color:#c0c4cc;font-size:18px;" class="el-icon-question"></i>
<i style="position: absolute; right: 10px; top: 10px; cursor: pointer; color: #c0c4cc; font-size: 18px" class="el-icon-question"></i>
</el-tooltip>
</div>
<div class="card-item__detail">
......
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