Skip to content

M
marketing
Commit 7cf59790 by chenyu
Options

Merge branch 'bugfix/1月5生产bug' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.36c74c499a8018ba8702924db197ac99.css
#	dist/static/css/main.3f64b12d078e75e364ec9b6caefa136c.css
#	dist/static/css/main.6f56bc990aa43c93c2fc8308c8c1fc38.css
#	dist/static/js/card.34f44f40e7fcd148fdaa.js
#	dist/static/js/card.4b0d5fbb8cfd49d71499.js
#	dist/static/js/card.5d79b9952ccba6daf955.js
#	dist/static/js/manifest.adb77752eb175a0bed6c.js
parents cd1dacf7 a8990e50
Showing with 15 additions and 6 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.3f64b12d078e75e364ec9b6caefa136c.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.36c74c499a8018ba8702924db197ac99.css rel=stylesheet></head><body><div id=app></div><script>(function() {
>>>>>>> bugfix/1月5生产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.130d20c47ea01053360f.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.4c2e853496cbfe27c994.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.130d20c47ea01053360f.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.4c2e853496cbfe27c994.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.adb77752eb175a0bed6c.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.4c2e853496cbfe27c994.js></script></body></html>
>>>>>>> bugfix/1月5生产bug
dist/static/css/main.36c74c499a8018ba8702924db197ac99.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.3f64b12d078e75e364ec9b6caefa136c.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.4b0d5fbb8cfd49d71499.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.5d79b9952ccba6daf955.js
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.adb77752eb175a0bed6c.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,i,d,u=0,s=[];u<r.length;u++)i=r[u],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,a);s.length;)s.shift()();if(a)for(u=0;u<a.length;u++)d=c(c.s=a[u]);return d};var r={},t={17:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.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:"4b0d5fbb8cfd49d71499",1:"2dd731d1ff33fa990671",2:"9cf200a6d8fb373f4c1d",3:"5f8152c80efc3c05278a",4:"3e0b9bc311b6ccc4a884",5:"6cee7d43f8d40289f05b",6:"f4c0010f0341e0437a0e",7:"59f8a7ef78bc0d73daf2",8:"4f634ce54471562d54aa",9:"7df670599b2f4e2eb861",10:"abe49fffc2f372f23708",11:"aeb00fcde81507fa4885",12:"091dd7723081a823098f",13:"e058d550c4872f50f70e",14:"744680d0554b14dcd0fd"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/recharge.4f634ce54471562d54aa.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/calllog/calllog.vue
......@@ -99,7 +99,7 @@ export default {
'mutations_layoutTips',
`<div class="layout--tips">
<i class="el-icon-info"></i>
通话录音默认存储3天，如需更长的期限，请在录音设置中开启。
通话录音默认存储3天。
</div>
`
);
......
src/views/card/record-send-Info.vue
......@@ -184,7 +184,7 @@ export default {
formatStatus(row) {
let _content = '';
const { status } = row;
let isOverdue = Date.now() >= row.limitTime;
let isOverdue = row.limitTime && Date.now() >= row.limitTime;
if (status == 3) {
_content = `<div class="${isOverdue ? 'dm-status--info' : 'dm-status--error'}">${isOverdue ? '已过期' : '待领取'}</div>`;
} else if (status == 4) {
......
src/views/recharge/recharge.vue
......@@ -31,8 +31,8 @@
<p class="fz12 gray line-height2">1、我们提供在线充值服务（目前仅支持微信）</p>
<p class="fz12 gray line-height2">2、请尽量保障账户余额大于您日常使用的额度，避免因余额不足导致业务中断</p>
<p class="fz12 gray line-height2">3、若未能及时充值或其他问题，请联系客户经理或客服人员</p>
<p class="fz12 gray line-height2">4、各项服务单价：国内短信验证码0.050元/条，国际短信验证码0.500元/条，语音验证码0.050元/条，双向呼叫0.420元/分钟</p>
<p class="fz12 gray line-height2">5、通话录音存储收费标准：「三个月{{ allUnitFee.storageThreeFee }}元/分钟」「六个月{{ allUnitFee.storageSixFee }}元/分钟」「十二个月{{ allUnitFee.storageTwelveFee }}元/分钟」，不满一分钟按一分钟收费</p>
<p class="fz12 gray line-height2">4、各项服务单价：国内短信验证码0.050元/条，国际短信验证码0.500元/条，双向呼叫0.420元/分钟</p>
<!-- <p class="fz12 gray line-height2">5、通话录音存储收费标准：「三个月{{ allUnitFee.storageThreeFee }}元/分钟」「六个月{{ allUnitFee.storageSixFee }}元/分钟」「十二个月{{ allUnitFee.storageTwelveFee }}元/分钟」，不满一分钟按一分钟收费</p> -->
</div>
</article>
<article v-if="step === 1">
......
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