Commit 6a4828ed by crushh

udpate: dist

parents 030fa96b b35c1b18
<<<<<<< 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/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.7903f6a2b4ee944c99856f36d05804d1.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.9cba769eed3151707c443f2da4cb30d9.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/ai营销时段
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.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.2d21ff6f98347ab27bdc.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.5c6ae1dffd16b0f20cdc.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.2d21ff6f98347ab27bdc.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.5c6ae1dffd16b0f20cdc.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.2956033087ab552bc061.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.49efa4669cdd190b2269.js></script></body></html>
>>>>>>> bugfix/ai营销时段
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,o){for(var f,d,i,u=0,s=[];u<n.length;u++)d=n[u],a[d]&&s.push(a[d][0]),a[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(n,t,o);s.length;)s.shift()();if(o)for(u=0;u<o.length;u++)i=r(r.s=o[u]);return i};var n={},a={25:0};function r(c){if(n[c])return n[c].exports;var a=n[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,r),a.l=!0,a.exports}r.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,r){c=a[e]=[n,r]});c[2]=n;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:"4bef8a93848f890575cc",1:"89efee8c01c0ff63e639",2:"837762799f9de67f9ff7",3:"75ea62c50b0f84572356",4:"a579e0d4d8aa6f6f6302",5:"203e4f6e985e67df6514",6:"683faea022b925c5c899",7:"fed72fe4c42bb8d8d839",8:"8d4c40ff420c756774b8",9:"936efa151c0c10b84dea",10:"1a27de8282c8acca16a9",11:"b3c01b56cf6bb230b455",12:"2cc9afcdab04796a1278",13:"c7783f06c3125f466186",14:"175d11ac2e03755c10ea",15:"d9311e9aefc4261c6843",16:"3a13ab17b1bd37aa0870",17:"950e47b18dffebce6cf2",18:"2af26558d70ad004e039",19:"480cefdabd2e30b85ede",20:"f88ddb7978003e576787",21:"3b70c426e7cb5384d238",22:"67ff09408b92aef14903"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),n},r.m=e,r.c=n,r.d=function(e,c,n){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="/marketing/",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
......@@ -164,6 +164,7 @@ export default {
let arr = [];
if (this.form.callFlag == 1) {
const res = await this.$refs.defineTime.submit();
console.log(res);
if (!res) return;
res.timeRangeList.forEach(item => {
if (Object.keys(item).length) {
......
......@@ -133,14 +133,19 @@ export default {
minutes = (end - start) / 60000 + minutes;
});
if (minutes < 60) {
this.$message.error('自定义时段不少于1个小时');
return;
this.$message.error('自定义时段不少于4个小时');
return false;
} else {
return true;
}
},
submit() {
return new Promise(resolve => {
this.handleCallTime();
this.$refs.defineTime.validate(val => {
if (!this.handleCallTime()) {
resolve(false);
return;
}
this.$refs.defineTime.validate((val, obj) => {
if (val) {
resolve(this.form);
} else {
......
......@@ -281,9 +281,9 @@ export default {
5: 'color:#000000'
},
bulletTop: {
1: 'top: 129px;color: #FFFFFF;',
2: 'top: 129px;color: #FFFFFF;',
3: 'top: 129px;color: #FFFFFF;',
1: 'top: 148px;color: #FFFFFF;',
2: 'top: 148px;color: #FFFFFF;',
3: 'top: 148px;color: #FFFFFF;',
5: 'top: 148px;color: #000000;'
}
};
......@@ -394,7 +394,7 @@ img {
.integral {
position: absolute;
z-index: 2;
top: 98px;
top: 120px;
left: 50%;
transform: translateX(-50%);
min-width: 120px;
......
......@@ -49,7 +49,7 @@
</div>
</div>
<div v-if="index == 1">
<div class="flex mb10"><el-checkbox v-model="item.conditionType" :true-label="0" :false-label="-1" :disabled="isDisabled" @change="$emit('change', { val: item.conditionJson.value, type: item.conditionType })" /> <span class="ml10">消耗积分获得游戏次数</span></div>
<div class="flex mb10"><el-checkbox v-model="item.conditionType" :true-label="0" :false-label="-1" :disabled="isDisabled" @change="$emit('change', { val: item.conditionJson.value, type: item.conditionType, id: 0 })" /> <span class="ml10">消耗积分获得游戏次数</span></div>
<div v-show="item.conditionType == 0">
<el-form-item label="参与游戏每次消耗积分" label-width="170px" :prop="'gameRuleConditionList.' + index + '.conditionJson.' + 'value'" :rules="{ required: true, message: '请输入积分' }">
<el-input-number class="w140" :disabled="isDisabled" placeholder="请输入积分" v-model="item.conditionJson.value" :min="1" :max="1000000" controls-position="right" @change="$emit('change', { val: item.conditionJson.value, type: item.conditionType, id: 0 })" />
......
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