Skip to content

M
marketing
Commit 24203d5a by caoyanzhi
Options

Merge branch 'bugfix/新建卡券bug' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/14.ca36a50fa1c81a514a25.js
#	dist/static/js/16.0da77f92b8d1ab2e6dff.js
#	dist/static/js/16.889437e1413d6e9f6eeb.js
#	dist/static/js/16.c0a9065dc5325606761e.js
#	dist/static/js/20.5a52b9833dcb22f70ce5.js
#	dist/static/js/activity.f5b84fca6e4b27f9cc2b.js
#	dist/static/js/calllog.f29792f3f1c01d3fc460.js
#	dist/static/js/ecm.03e2031b9c8a1d95ef49.js
#	dist/static/js/ecm.093c2cbb5df5215f88fb.js
#	dist/static/js/ecm.186caa3f4f0759361f1b.js
#	dist/static/js/evaluation.05805c828212ef57fdf6.js
#	dist/static/js/evaluation.0756ab734cd7ddc9e1b3.js
#	dist/static/js/evaluation.add5e8e548c56fcec5b0.js
#	dist/static/js/ewash.1ff85c307f9e68524f34.js
#	dist/static/js/ewash.3a925198ae35e1df36dc.js
#	dist/static/js/ewash.a66aa99eb1b571499bc9.js
parents 2c53a09f 6422f588
Showing with 15 additions and 2 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.4cff07f537b981456eb7cec4bd7832ce.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.e48bea8f183b32e00e0d27b24a178e65.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/新建卡券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 ? '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.ecd801dee8ef73df1010.js></script><script type=text/javascript src=/marketing/static/js/vendor.bb462fbfad059ea69d64.js></script><script type=text/javascript src=/marketing/static/js/main.051a5d6cfb2cbc1aba3e.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.ecd801dee8ef73df1010.js></script><script type=text/javascript src=/marketing/static/js/vendor.bb462fbfad059ea69d64.js></script><script type=text/javascript src=/marketing/static/js/main.051a5d6cfb2cbc1aba3e.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.e464e222f188aba4b287.js></script><script type=text/javascript src=/marketing/static/js/vendor.56171c224a18ddaa2a5b.js></script><script type=text/javascript src=/marketing/static/js/main.ccdd3742b734cd36dd94.js></script></body></html>
>>>>>>> bugfix/新建卡券bug
dist/static/css/main.e48bea8f183b32e00e0d27b24a178e65.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.889437e1413d6e9f6eeb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.c0a9065dc5325606761e.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/21.bcdc75ff51ab2d95ee5e.js 0 → 100644
webpackJsonp([21],{ARdd:function(e,t){},PIjF:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n("ARdd"),i=n.n(r);for(var u in r)"default"!==u&&function(e){n.d(t,e,function(){return r[e]})}(u);var a=n("y/Ol"),l=n("VU/8")(i.a,a.a,!1,null,null,null);t.default=l.exports},"y/Ol":function(e,t,n){"use strict";var r={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",[t("keep-alive",[this.$route.meta.keepAlive?t("router-view"):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)},staticRenderFns:[]};t.a=r}});
\ No newline at end of file
dist/static/js/card.9087df6bec6608c0cf1c.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.03e2031b9c8a1d95ef49.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.186caa3f4f0759361f1b.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.05805c828212ef57fdf6.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.add5e8e548c56fcec5b0.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ewash.3a925198ae35e1df36dc.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ewash.a66aa99eb1b571499bc9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.7507fdeff5c0867480a7.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.e464e222f188aba4b287.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,f){for(var o,d,i,u=0,b=[];u<n.length;u++)d=n[u],r[d]&&b.push(r[d][0]),r[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(n,t,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=a(a.s=f[u]);return i};var n={},r={25:0};function a(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,a){c=r[e]=[n,a]});c[2]=n;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.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:"9087df6bec6608c0cf1c",1:"7507fdeff5c0867480a7",2:"a08dcea210c405f15338",3:"03e2031b9c8a1d95ef49",4:"fc4509562d17ebde0b58",5:"3a925198ae35e1df36dc",6:"8d36dfdbdf6214abd9ce",7:"d259c778d6f869fb526a",8:"f5b84fca6e4b27f9cc2b",9:"9f02fe507eaa1df7c34d",10:"05805c828212ef57fdf6",11:"f25cae76efda1e5b1836",12:"00c2a41159b68b655669",13:"caf9643b6d00dcf7247a",14:"ca36a50fa1c81a514a25",15:"f29792f3f1c01d3fc460",16:"889437e1413d6e9f6eeb",17:"99b27815f3d7b860fa94",18:"5392b1baea956710be94",19:"fe0036eb8f61ebf5eccf",20:"5a52b9833dcb22f70ce5",21:"bcdc75ff51ab2d95ee5e",22:"182b107280d4efbe9603"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),n},a.m=e,a.c=n,a.d=function(e,c,n){a.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(c,"a",c),c},a.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/message.fc4509562d17ebde0b58.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.caf9643b6d00dcf7247a.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.00c2a41159b68b655669.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/recharge.d259c778d6f869fb526a.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.8d36dfdbdf6214abd9ce.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.56171c224a18ddaa2a5b.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.a08dcea210c405f15338.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/card/form.js
......@@ -695,10 +695,12 @@ export default {
this.sale_limit = JSON.parse(JSON.stringify(sale_limit));
this.goods = JSON.parse(JSON.stringify(goods));
this.form.cardType = e;
this.form.cardDenomination = undefined;
if (this.form.cardType != 3) {
this.$nextTick(_ => {
this.$refs.storeCard.initLeftList();
});
this.form.cardDenomination = 0;
}
this.goodsList = [{ v1: '', f2: [], v2: '', f3: [], v3: [], list: [] }];
// 新增情况下，如果配置了线下门店，默认选中线下门店
......
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