Skip to content

M
marketing
Commit 9a240f75 by caoyanzhi
Options

Merge branch 'bugfix/新建卡券-门店选择器bug' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.8d69f95f1af4fd7c6075ff52031f9320.css
#	dist/static/css/main.d3a9130a1cedcfdf1a9a02e4f37ca2c5.css
#	dist/static/css/main.e3dbb32bbe6397f5fb9c1a1db62ee609.css
#	dist/static/js/manifest.91dadf23f38f4222f8b8.js
#	dist/static/js/popup.a9c96693800d81498fff.js
parents 4f14655e ae80a52d
Showing with 17 additions and 4 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.e3dbb32bbe6397f5fb9c1a1db62ee609.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.8d69f95f1af4fd7c6075ff52031f9320.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.2d70371486e3aaa33f30.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.2d70371486e3aaa33f30.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.91dadf23f38f4222f8b8.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.6e48362b5cb668d37572.js></script></body></html>
>>>>>>> bugfix/新建卡券-门店选择器bug
dist/static/css/main.8d69f95f1af4fd7c6075ff52031f9320.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.e3dbb32bbe6397f5fb9c1a1db62ee609.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.91dadf23f38f4222f8b8.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(a,c,o){for(var f,d,b,i=0,u=[];i<a.length;i++)d=a[i],r[d]&&u.push(r[d][0]),r[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(a,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var a={},r={25:0};function t(n){if(a[n])return a[n].exports;var r=a[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var n=r[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var a=new Promise(function(a,t){n=r[e]=[a,t]});n[2]=a;var c=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:"1bfc28cdfdbd925237d8",1:"4bae1568fe34f4ea4acc",2:"78a893a3285592901952",3:"09c6c06cb3314d6adea6",4:"a11ede89dfa4f6dd621b",5:"1ff85c307f9e68524f34",6:"cc6d123e6bb64892a5b5",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"84b91fefa20d9462504c",10:"0756ab734cd7ddc9e1b3",11:"f0c61288632fe8432bef",12:"542c4ddb036b0917ab07",13:"200e6bfe2fb2f86c8231",14:"3fce568e31fac1e807d2",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=r[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),a},t.m=e,t.c=a,t.d=function(e,n,a){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:a})},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/popup.542c4ddb036b0917ab07.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
......@@ -1174,6 +1174,10 @@ export default {
return;
}
}
if (this.storeMode == 1 && !this.uuid) {
this.$message.warning('请选择适用门店');
return;
}
this.$refs[formName].validate(valid => {
if (valid) {
this.saveUpdateCard();
......
src/views/card/form.vue
......@@ -447,7 +447,7 @@
</div>
<div class="fz12 gray " v-else>* 仅支持选择账号管辖门店范围内的门店；</div>
<!-- :readonly="isEdit" -->
<vue-gic-store-card class="pt10" :readonly="isInfo" v-bind="storeParams" v-show="storeMode" ref="storeCard" :uuid.sync="uuid"></vue-gic-store-card>
<vue-gic-store-card class="pt10" :readonly="isInfo" v-bind="storeParams" v-show="storeMode" ref="storeCard" :uuid.sync="uuid" @save="flag => (submitLoading = flag)"></vue-gic-store-card>
<!-- <dm-store-selector v-if="isAdd ? storeMode : storeMode && !isAdd && uuid" :readonly="isInfo" v-bind="storeParams" ref="storeCard" :uuid.sync="uuid"></dm-store-selector> -->
<el-alert v-show="storeMode && form.cardApplyChannel.indexOf('WMmicroMall') !== -1" title="选择的门店必须保持与微盟侧门店一致，请确认选择无误" type="warning" show-icon :closable="false" class="mt20 width80"></el-alert>
</el-form-item>
......@@ -471,7 +471,7 @@
<dm-form-bottom>
<el-button v-if="form.useCustomCode === 0 && form.giveFlag" :disabled="!preview.disabled" @click="preview.visible = true">转赠预览</el-button>
<el-button type="primary" @click="submitForm('form')" v-loading="submitLoading" v-show="!isInfo && canEdit && $store.state.marketing.appletEnable">保存</el-button>
<el-button type="primary" @click="submitForm('form')" v-loading="submitLoading" :disabled="submitLoading" v-show="!isInfo && canEdit && $store.state.marketing.appletEnable">保存</el-button>
<el-button @click="$router.push('/card/list')">返 回</el-button>
</dm-form-bottom>
</el-form>
......
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